diff options
| author | snowleo <schneeleo@gmail.com> | 2012-02-21 18:34:53 +0100 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2012-02-21 18:34:53 +0100 |
| commit | 4da3f52164f118825ace616408b4ce13571cab63 (patch) | |
| tree | 05b19c7261df84eaa8a6bda460af562bd72eb484 /EssentialsChat | |
| parent | cae3c5a03e2a3306c09132e277b2ea010ec8385b (diff) | |
| parent | cf7da7a83fef4d7734ed1ed5b672f2e07749b679 (diff) | |
| download | Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.gz Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.lz Essentials-4da3f52164f118825ace616408b4ce13571cab63.tar.xz Essentials-4da3f52164f118825ace616408b4ce13571cab63.zip | |
Merge branch 'refs/heads/master' into 3.0
Conflicts:
.gitignore
Essentials/src/com/earth2me/essentials/Essentials.java
Essentials/src/com/earth2me/essentials/EssentialsTimer.java
Essentials/src/com/earth2me/essentials/ISettings.java
Essentials/src/com/earth2me/essentials/Jails.java
Essentials/src/com/earth2me/essentials/OfflinePlayer.java
Essentials/src/com/earth2me/essentials/Settings.java
Essentials/src/com/earth2me/essentials/User.java
Essentials/src/com/earth2me/essentials/UserData.java
Essentials/src/com/earth2me/essentials/UserMap.java
Essentials/src/com/earth2me/essentials/Util.java
Essentials/src/com/earth2me/essentials/commands/Commandnear.java
Essentials/src/com/earth2me/essentials/commands/Commandping.java
Essentials/src/com/earth2me/essentials/commands/Commandspawner.java
Essentials/src/com/earth2me/essentials/commands/Commandspawnmob.java
Essentials/src/com/earth2me/essentials/commands/Commandsuicide.java
Essentials/src/com/earth2me/essentials/commands/Commandtpaccept.java
Essentials/src/com/earth2me/essentials/commands/Commandwarp.java
Essentials/src/messages_en.properties
Essentials2Compat/src/com/earth2me/essentials/EssentialsConf.java
Essentials2Compat/src/com/earth2me/essentials/EssentialsUpgrade.java
EssentialsChat/src/plugin.yml
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtect.java
EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java
EssentialsSpawn/src/com/earth2me/essentials/spawn/EssentialsSpawnPlayerListener.java
Diffstat (limited to 'EssentialsChat')
| -rw-r--r-- | EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java | 2 | ||||
| -rw-r--r-- | EssentialsChat/src/plugin.yml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java index 4e2d68159..f2e36e094 100644 --- a/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java +++ b/EssentialsChat/src/com/earth2me/essentials/chat/ChatStore.java @@ -35,6 +35,6 @@ public class ChatStore public final String getLongType() { - return type.length() > 0 ? "chat" : "chat-" + type; + return type.length() == 0 ? "chat" : "chat-" + type; } } diff --git a/EssentialsChat/src/plugin.yml b/EssentialsChat/src/plugin.yml index 8ce317ce2..6ecadd4d3 100644 --- a/EssentialsChat/src/plugin.yml +++ b/EssentialsChat/src/plugin.yml @@ -5,6 +5,6 @@ main: com.earth2me.essentials.chat.EssentialsChat version: TeamCity website: http://tiny.cc/EssentialsWiki description: Provides chat control features for Essentials. Requires Permissions. -authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, Okamosy] +authors: [Zenexer, ementalo, Aelux, Brettflan, KimKandor, snowleo, ceulemans, Xeology, KHobbits, md_5, Okamosy] depend: [Essentials3] #softdepend: [Factions]
\ No newline at end of file |