Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-04 18:47:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #16 from Brettflan/master

Browse Source 
Fix for local chat, leftover Factions cleanup
This commit is contained in:
snowleo 2011-07-20 16:43:41 -07:00
commit b8e41df0f6
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EssentialsChat/nbproject/project.properties
View File

@ -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

3
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
View File

@ -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);

2
EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayerListener.java
View File

@ -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());

BIN
lib/Factions.jar
View File

Binary file not shown.