diff options
| author | ementalo <ementalodev@gmx.co.uk> | 2012-07-20 12:12:21 +0100 |
|---|---|---|
| committer | ementalo <ementalodev@gmx.co.uk> | 2012-07-20 12:12:21 +0100 |
| commit | 26e5b52c26298ec3624712c8a35240dac70bd411 (patch) | |
| tree | 7b1ddc4d4f23895f30775364d9b7eb236ce77da2 /EssentialsChat/src/net/ess3/chat | |
| parent | ea1cce76f9276cf80efdf68238f1604f79c82e17 (diff) | |
| download | Essentials-26e5b52c26298ec3624712c8a35240dac70bd411.tar Essentials-26e5b52c26298ec3624712c8a35240dac70bd411.tar.gz Essentials-26e5b52c26298ec3624712c8a35240dac70bd411.tar.lz Essentials-26e5b52c26298ec3624712c8a35240dac70bd411.tar.xz Essentials-26e5b52c26298ec3624712c8a35240dac70bd411.zip | |
Some user matching updates
Diffstat (limited to 'EssentialsChat/src/net/ess3/chat')
3 files changed, 4 insertions, 4 deletions
diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java index ae8fce4a1..f3ce3abaf 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsChatPlayer.java @@ -71,7 +71,7 @@ public abstract class EssentialsChatPlayer implements Listener { if (sender instanceof Player) { - charge.charge(ess.getUser((Player)sender)); + charge.charge(ess.getUserMap().getUser((Player)sender)); } } diff --git a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java index be7b20ba6..f248a21a4 100644 --- a/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java +++ b/EssentialsChat/src/net/ess3/chat/EssentialsLocalChatEventListener.java @@ -35,8 +35,8 @@ public class EssentialsLocalChatEventListener implements Listener for (Player onlinePlayer : server.getOnlinePlayers()) { String type = _("chatTypeLocal"); - final IUser user = ess.getUser(onlinePlayer); - if (user.isIgnoringPlayer(ess.getUser(sender))) + final IUser user = ess.getUserMap().getUser(onlinePlayer); + if (user.isIgnoringPlayer(ess.getUserMap().getUser(sender))) { continue; } diff --git a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java index dfe96df35..5c2fa1d7e 100644 --- a/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java +++ b/EssentialsChat/src/net/ess3/chat/listenerlevel/EssentialsChatPlayerListenerLowest.java @@ -28,7 +28,7 @@ public class EssentialsChatPlayerListenerLowest extends EssentialsChatPlayer { return; } - final IUser user = ess.getUser(event.getPlayer()); + final IUser user = ess.getUserMap().getUser(event.getPlayer()); final ChatStore chatStore = new ChatStore(ess, user, getChatType(event.getMessage())); setChatStore(event, chatStore); formatChat(event, chatStore); |