From 5dbf4f5a00ecfaa6307a54446b77e67c8ccc0833 Mon Sep 17 00:00:00 2001 From: KHobbits Date: Sat, 7 Dec 2013 23:58:47 +0000 Subject: Make it so both {world} and {worldname} work for both keyword parsers. --- Essentials/src/com/earth2me/essentials/Settings.java | 1 + Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java | 2 ++ 2 files changed, 3 insertions(+) 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), -- cgit v1.2.3