diff options
| author | KHobbits <rob@khobbits.co.uk> | 2013-12-07 23:58:47 +0000 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2013-12-07 23:58:47 +0000 |
| commit | b5a56a733d2e4c89c289e23929c2e75d1908634d (patch) | |
| tree | 07c16ce47836412004aad3b906bff0a4f9c4ad80 | |
| parent | f1a39e06d92e7fc448991f361204e81117a74223 (diff) | |
| download | Essentials-b5a56a733d2e4c89c289e23929c2e75d1908634d.tar Essentials-b5a56a733d2e4c89c289e23929c2e75d1908634d.tar.gz Essentials-b5a56a733d2e4c89c289e23929c2e75d1908634d.tar.lz Essentials-b5a56a733d2e4c89c289e23929c2e75d1908634d.tar.xz Essentials-b5a56a733d2e4c89c289e23929c2e75d1908634d.zip | |
Make it so both {world} and {worldname} work for both keyword parsers.
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/Settings.java | 1 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/Settings.java b/Essentials/src/com/earth2me/essentials/Settings.java index ec9bfd949..3ce7b9b99 100644 --- a/Essentials/src/com/earth2me/essentials/Settings.java +++ b/Essentials/src/com/earth2me/essentials/Settings.java @@ -416,6 +416,7 @@ public class Settings implements net.ess3.api.ISettings mFormat = mFormat.replace("{DISPLAYNAME}", "%1$s"); mFormat = mFormat.replace("{MESSAGE}", "%2$s"); mFormat = mFormat.replace("{GROUP}", "{0}"); + mFormat = mFormat.replace("{WORLD}", "{1}"); mFormat = mFormat.replace("{WORLDNAME}", "{1}"); mFormat = mFormat.replace("{SHORTWORLDNAME}", "{2}"); mFormat = mFormat.replace("{TEAMPREFIX}", "{3}"); diff --git a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java index d936c4b10..193700adc 100644 --- a/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java +++ b/Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java @@ -159,6 +159,7 @@ public class KeywordReplacer implements IText } break; case WORLD: + case WORLDNAME: if (user != null) { final Location location = user.getLocation(); @@ -368,6 +369,7 @@ enum KeywordType BALANCE(KeywordCachable.CACHEABLE), MAILS(KeywordCachable.CACHEABLE), WORLD(KeywordCachable.CACHEABLE), + WORLDNAME(KeywordCachable.CACHEABLE), ONLINE(KeywordCachable.CACHEABLE), UNIQUE(KeywordCachable.CACHEABLE), WORLDS(KeywordCachable.CACHEABLE), |