TotalFreedomMC/TF-EssentialsX
1
0
Fork 0
mirror of https://github.com/TotalFreedomMC/TF-EssentialsX.git synced 2025-04-25 16:09:44 +00:00
Code Issues Projects Releases Wiki Activity

Make it so both {world} and {worldname} work for both keyword parsers.

Browse source
This commit is contained in:
KHobbits 2013-12-07 23:58:47 +00:00
parent af02a28ce5
commit 5dbf4f5a00
2 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Essentials/src/com/earth2me/essentials/Settings.java
View file

@ -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}");

2
Essentials/src/com/earth2me/essentials/textreader/KeywordReplacer.java
View file

@ -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),