From 37169dc6ec3ebd0f9d4be88b858b644f7eef4d26 Mon Sep 17 00:00:00 2001 From: Olof Larsson Date: Sun, 5 Feb 2012 18:55:26 +0100 Subject: [PATCH] Added command logging as for default commands and temporairly removed Essentials old features as it does not compile in Eclipse :/ sorry about this. How would we go about getting this compile in Eclipse and Netbeans at the same time? --- src/com/massivecraft/factions/P.java | 7 ++++--- ...Features.java => EssentialsOldVersionFeaturesTODO.java} | 2 +- .../factions/zcore/MPluginSecretPlayerListener.java | 3 +++ 3 files changed, 8 insertions(+), 4 deletions(-) rename src/com/massivecraft/factions/integration/{EssentialsOldVersionFeatures.java => EssentialsOldVersionFeaturesTODO.java} (97%) diff --git a/src/com/massivecraft/factions/P.java b/src/com/massivecraft/factions/P.java index 434ced79..f653a3bc 100644 --- a/src/com/massivecraft/factions/P.java +++ b/src/com/massivecraft/factions/P.java @@ -24,7 +24,6 @@ import com.massivecraft.factions.cmd.*; import com.massivecraft.factions.integration.capi.CapiFeatures; import com.massivecraft.factions.integration.Econ; import com.massivecraft.factions.integration.EssentialsFeatures; -import com.massivecraft.factions.integration.EssentialsOldVersionFeatures; import com.massivecraft.factions.integration.LWCFeatures; import com.massivecraft.factions.integration.SpoutFeatures; import com.massivecraft.factions.integration.Worldguard; @@ -195,7 +194,8 @@ public class P extends MPlugin // no? try older Essentials 2.x integration method try { - EssentialsOldVersionFeatures.integrateChat(essChat); + // TODO: Creates errors in eclipse + //EssentialsOldVersionFeatures.integrateChat(essChat); } catch (NoClassDefFoundError ex2) { @@ -211,7 +211,8 @@ public class P extends MPlugin { try { - EssentialsOldVersionFeatures.unhookChat(); + // TODO: Creates errors in eclipse + //EssentialsOldVersionFeatures.unhookChat(); } catch (NoClassDefFoundError ex) { diff --git a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeaturesTODO.java similarity index 97% rename from src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java rename to src/com/massivecraft/factions/integration/EssentialsOldVersionFeaturesTODO.java index e867820a..86178846 100644 --- a/src/com/massivecraft/factions/integration/EssentialsOldVersionFeatures.java +++ b/src/com/massivecraft/factions/integration/EssentialsOldVersionFeaturesTODO.java @@ -14,7 +14,7 @@ import com.earth2me.essentials.chat.IEssentialsChatListener; * This Essentials integration handler is for older 2.x.x versions of Essentials which have "IEssentialsChatListener" */ -public class EssentialsOldVersionFeatures +public class EssentialsOldVersionFeaturesTODO { private static EssentialsChat essChat; diff --git a/src/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java b/src/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java index 6e111781..80787f97 100644 --- a/src/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java +++ b/src/com/massivecraft/factions/zcore/MPluginSecretPlayerListener.java @@ -1,5 +1,6 @@ package com.massivecraft.factions.zcore; +import org.bukkit.Bukkit; import org.bukkit.event.player.PlayerChatEvent; import org.bukkit.event.player.PlayerCommandPreprocessEvent; import org.bukkit.event.player.PlayerListener; @@ -25,6 +26,7 @@ public class MPluginSecretPlayerListener extends PlayerListener if (p.handleCommand(event.getPlayer(), event.getMessage())) { + Bukkit.getLogger().info("[PLAYER_COMMAND] "+event.getPlayer().getName()+": "+event.getMessage()); event.setCancelled(true); } } @@ -36,6 +38,7 @@ public class MPluginSecretPlayerListener extends PlayerListener if (p.handleCommand(event.getPlayer(), event.getMessage())) { + Bukkit.getLogger().info("[PLAYER_COMMAND] "+event.getPlayer().getName()+": "+event.getMessage()); event.setCancelled(true); } }