summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKHobbits <rob@khobbits.co.uk>2012-01-26 00:01:49 +0000
committerKHobbits <rob@khobbits.co.uk>2012-01-26 00:01:49 +0000
commit72ed86e0dd030f24e67fe29ebb9eb471e206e0d0 (patch)
treec037062b66ac8d3ad42e067557e397dc4d55ebb0
parentc689b55c4ddff6483799e021334e403db745562e (diff)
downloadEssentials-72ed86e0dd030f24e67fe29ebb9eb471e206e0d0.tar
Essentials-72ed86e0dd030f24e67fe29ebb9eb471e206e0d0.tar.gz
Essentials-72ed86e0dd030f24e67fe29ebb9eb471e206e0d0.tar.lz
Essentials-72ed86e0dd030f24e67fe29ebb9eb471e206e0d0.tar.xz
Essentials-72ed86e0dd030f24e67fe29ebb9eb471e206e0d0.zip
Tidy chat.
-rw-r--r--Essentials/src/com/earth2me/essentials/user/User.java1
-rw-r--r--EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java3
2 files changed, 1 insertions, 3 deletions
diff --git a/Essentials/src/com/earth2me/essentials/user/User.java b/Essentials/src/com/earth2me/essentials/user/User.java
index 57469151b..b26e8d83a 100644
--- a/Essentials/src/com/earth2me/essentials/user/User.java
+++ b/Essentials/src/com/earth2me/essentials/user/User.java
@@ -255,6 +255,7 @@ public class User extends UserBase implements IUser
if (settings.getData().getCommands().isDisabled("nick") || nick == null || nick.isEmpty() || nick.equals(getName()))
{
displayname = displayname.replace("{NAME}", getName());
+ displayname = displayname.replace("{NICKNAMEPREFIX}", "");
}
else
{
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
index e6e02aeaf..a4d4283a7 100644
--- a/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
+++ b/EssentialsChat/src/com/earth2me/essentials/chat/EssentialsChat.java
@@ -35,7 +35,6 @@ public class EssentialsChat extends JavaPlugin
final Map<PlayerChatEvent, ChatStore> chatStore = new HashMap<PlayerChatEvent, ChatStore>();
-
final EssentialsChatPlayerListenerLowest playerListenerLowest = new EssentialsChatPlayerListenerLowest(getServer(), ess, chatStore);
final EssentialsChatPlayerListenerNormal playerListenerNormal = new EssentialsChatPlayerListenerNormal(getServer(), ess, chatStore);
final EssentialsChatPlayerListenerHighest playerListenerHighest = new EssentialsChatPlayerListenerHighest(getServer(), ess, chatStore);
@@ -45,8 +44,6 @@ public class EssentialsChat extends JavaPlugin
final EssentialsLocalChatEventListener localChatListener = new EssentialsLocalChatEventListener(getServer(), ess);
pluginManager.registerEvents(localChatListener, this);
-
- LOGGER.info(_("loadinfo", this.getDescription().getName(), this.getDescription().getVersion(), "essentials team"));
}
@Override