From cee0823db41abb93557de04d18f7d86c5ddd125a Mon Sep 17 00:00:00 2001 From: Brettflan Date: Wed, 20 Jul 2011 18:06:58 -0500 Subject: Removed leftovers from initial Factions integration --- EssentialsChat/nbproject/project.properties | 4 +--- .../com/earth2me/essentials/chat/EssentialsChat.java | 3 +-- lib/Factions.jar | Bin 316592 -> 0 bytes 3 files changed, 2 insertions(+), 5 deletions(-) delete mode 100644 lib/Factions.jar diff --git a/EssentialsChat/nbproject/project.properties b/EssentialsChat/nbproject/project.properties index 2e51b176b..08df72abc 100644 --- a/EssentialsChat/nbproject/project.properties +++ b/EssentialsChat/nbproject/project.properties @@ -27,13 +27,11 @@ dist.javadoc.dir=${dist.dir}/javadoc endorsed.classpath= excludes= file.reference.bukkit-0.0.1-SNAPSHOT.jar=../lib/bukkit-0.0.1-SNAPSHOT.jar -file.reference.Factions.jar=../lib/Factions.jar includes=** jar.compress=false javac.classpath=\ ${reference.Essentials.jar}:\ - ${file.reference.bukkit-0.0.1-SNAPSHOT.jar}:\ - ${file.reference.Factions.jar} + ${file.reference.bukkit-0.0.1-SNAPSHOT.jar} # Space-separated list of extra javac options javac.compilerargs= javac.deprecation=false diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java index 4807ada0f..20b3756d0 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java @@ -22,8 +22,7 @@ public class EssentialsChat extends JavaPlugin final PluginManager pluginManager = getServer().getPluginManager(); final IEssentials ess = (IEssentials)pluginManager.getPlugin("Essentials"); - chatListener = new HashMap(); - //EssentialsChatPlayerListener.checkFactions(pluginManager); + chatListener = new HashMap(); final EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer(), ess, chatListener); pluginManager.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Highest, this); diff --git a/lib/Factions.jar b/lib/Factions.jar deleted file mode 100644 index af13995ae..000000000 Binary files a/lib/Factions.jar and /dev/null differ -- cgit v1.2.3 From 602517473d47971bc80a34620f1ad56af66e28a3 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Wed, 20 Jul 2011 18:08:02 -0500 Subject: Fix for local chat not working (instead acting just like global chat) --- .../src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java index b38073909..c4874d631 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java @@ -100,7 +100,7 @@ public class EssentialsChatPlayerListener extends PlayerListener { continue; } - if (u.equals(user) && !u.isAuthorized("essentials.chat.spy")) + if (!u.equals(user) && !u.isAuthorized("essentials.chat.spy")) { final Location l = u.getLocation(); final int dx = Math.abs(x - l.getBlockX()); -- cgit v1.2.3