diff options
| author | snowleo <schneeleo@gmail.com> | 2011-07-20 16:43:41 -0700 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-07-20 16:43:41 -0700 |
| commit | 1f127a7775c828c722f902c8a5d82a7af912956c (patch) | |
| tree | 19e44d93d9c81e889bd11d6f1bd2351aac8b25de | |
| parent | e70f23af237703b004cb941c0a1a352ec6b49a7d (diff) | |
| parent | 8de179d772be8b9ae9499b399b8f384b0d41aa1a (diff) | |
| download | Essentials-1f127a7775c828c722f902c8a5d82a7af912956c.tar Essentials-1f127a7775c828c722f902c8a5d82a7af912956c.tar.gz Essentials-1f127a7775c828c722f902c8a5d82a7af912956c.tar.lz Essentials-1f127a7775c828c722f902c8a5d82a7af912956c.tar.xz Essentials-1f127a7775c828c722f902c8a5d82a7af912956c.zip | |
Merge pull request #16 from Brettflan/master
Fix for local chat, leftover Factions cleanup
3 files changed, 3 insertions, 6 deletions
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<String, IEssentialsChatListener>(); - //EssentialsChatPlayerListener.checkFactions(pluginManager); + chatListener = new HashMap<String, IEssentialsChatListener>(); final EssentialsChatPlayerListener playerListener = new EssentialsChatPlayerListener(getServer(), ess, chatListener); pluginManager.registerEvent(Type.PLAYER_CHAT, playerListener, Priority.Highest, this); 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()); |