summaryrefslogtreecommitdiffstats
path: root/EssentialsChat/src/com
diff options
context:
space:
mode:
authormd_5 <md_5@bigpond.com>2012-06-27 20:27:27 +1000
committermd_5 <md_5@bigpond.com>2012-06-27 20:27:27 +1000
commit06f54fdbac1874c549b5181d92b4a9474da55dcc (patch)
tree0390c78353d15cc239512fd2b9a1990df58b7300 /EssentialsChat/src/com
parent4561a7f0106adb7bd62e2d42114cb80a3a30b570 (diff)
downloadEssentials-06f54fdbac1874c549b5181d92b4a9474da55dcc.tar
Essentials-06f54fdbac1874c549b5181d92b4a9474da55dcc.tar.gz
Essentials-06f54fdbac1874c549b5181d92b4a9474da55dcc.tar.lz
Essentials-06f54fdbac1874c549b5181d92b4a9474da55dcc.tar.xz
Essentials-06f54fdbac1874c549b5181d92b4a9474da55dcc.zip
That just leaves the big ol' core. Largely ignore Compat as it is very temporary.
Diffstat (limited to 'EssentialsChat/src/com')
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java6
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java2
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java5
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java2
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java3
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java3
6 files changed, 8 insertions, 13 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java
index 9a8bd9e88..43142915f 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatPermissions.java
@@ -6,7 +6,9 @@ import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
-public class ChatPermissions {
+
+public class ChatPermissions
+{
private static Map<String, IPermission> permissions = new HashMap<String, IPermission>();
public static IPermission getPermission(final String groupName)
@@ -14,7 +16,7 @@ public class ChatPermissions {
IPermission perm = permissions.get(groupName);
if (perm == null)
{
- perm = new BasePermission("essentials.chat.",groupName.toLowerCase(Locale.ENGLISH));
+ perm = new BasePermission("essentials.chat.", groupName.toLowerCase(Locale.ENGLISH));
permissions.put(groupName, perm);
}
return perm;
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
index 887ac8337..f01ada07b 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java
@@ -1,8 +1,8 @@
package com.earth2me.essentials.chat;
-import com.earth2me.essentials.economy.Trade;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
+import com.earth2me.essentials.economy.Trade;
public class ChatStore
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
index a4d4283a7..1ff0d6f41 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
@@ -45,9 +45,4 @@ public class EssentialsChat extends JavaPlugin
final EssentialsLocalChatEventListener localChatListener = new EssentialsLocalChatEventListener(getServer(), ess);
pluginManager.registerEvents(localChatListener, this);
}
-
- @Override
- public void onDisable()
- {
- }
}
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
index d0ae47d31..fcd9d7e01 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChatPlayer.java
@@ -111,7 +111,7 @@ public abstract class EssentialsChatPlayer implements Listener
protected void handleLocalChat(final PlayerChatEvent event, final ChatStore chatStore)
{
-
+
long radius = 0;
ISettings settings = ess.getSettings();
settings.acquireReadLock();
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java
index 2eae385a9..4ca1a4496 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEvent.java
@@ -98,6 +98,7 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable
return parentEvent;
}
+ @Override
public HandlerList getHandlers()
{
return handlers;
@@ -107,4 +108,4 @@ public class EssentialsLocalChatEvent extends Event implements Cancellable
{
return handlers;
}
-} \ No newline at end of file
+}
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
index 04c49b698..db596b15f 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsLocalChatEventListener.java
@@ -3,8 +3,6 @@ package com.earth2me.essentials.chat;
import static com.earth2me.essentials.I18n._;
import com.earth2me.essentials.api.IEssentials;
import com.earth2me.essentials.api.IUser;
-import com.earth2me.essentials.permissions.Permissions;
-import java.util.logging.Logger;
import org.bukkit.Location;
import org.bukkit.Server;
import org.bukkit.World;
@@ -18,7 +16,6 @@ public class EssentialsLocalChatEventListener implements Listener
{
protected transient IEssentials ess;
protected final transient Server server;
- private static final Logger LOGGER = Logger.getLogger("Minecraft");
public EssentialsLocalChatEventListener(final Server server, final IEssentials ess)
{