diff options
| author | Iaccidentally <coryhuckaby@gmail.com> | 2012-09-06 19:16:36 -0700 |
|---|---|---|
| committer | Iaccidentally <coryhuckaby@gmail.com> | 2012-09-06 19:16:36 -0700 |
| commit | 42710eb76cb0148e4fc13bd272dea46fbdd08e9b (patch) | |
| tree | a0ebcaca08f846c2f183a41e273405164539d13e | |
| parent | 10b161ce09e910804ab16d3f7f5b2152228359ee (diff) | |
| parent | 6d58ec8cc1cf5c792b5f492b0e4f58f64eb8e94d (diff) | |
| download | Essentials-42710eb76cb0148e4fc13bd272dea46fbdd08e9b.tar Essentials-42710eb76cb0148e4fc13bd272dea46fbdd08e9b.tar.gz Essentials-42710eb76cb0148e4fc13bd272dea46fbdd08e9b.tar.lz Essentials-42710eb76cb0148e4fc13bd272dea46fbdd08e9b.tar.xz Essentials-42710eb76cb0148e4fc13bd272dea46fbdd08e9b.zip | |
Merge pull request #137 from mbax/simoleon
Consistency in simoleon usage.
| -rw-r--r-- | Essentials/src/net/ess3/settings/SpawnsHolder.java | 2 | ||||
| -rw-r--r-- | Essentials/src/net/ess3/utils/textreader/TextInput.java | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Essentials/src/net/ess3/settings/SpawnsHolder.java b/Essentials/src/net/ess3/settings/SpawnsHolder.java index ea2a1f8b1..c07191752 100644 --- a/Essentials/src/net/ess3/settings/SpawnsHolder.java +++ b/Essentials/src/net/ess3/settings/SpawnsHolder.java @@ -180,7 +180,7 @@ public class SpawnsHolder extends AsyncStorageObjectHolder<Spawns> implements IE acquireReadLock(); try { - return getData().getNewPlayerAnnouncement().replace('&', '§').replace("§§", "&").replace("{PLAYER}", user.getPlayer().getDisplayName()).replace("{DISPLAYNAME}", user.getPlayer().getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getPlayer().getAddress().toString()); + return getData().getNewPlayerAnnouncement().replace('&', '\u00a7').replace("\u00a7\u00a7", "&").replace("{PLAYER}", user.getPlayer().getDisplayName()).replace("{DISPLAYNAME}", user.getPlayer().getDisplayName()).replace("{GROUP}", ess.getRanks().getMainGroup(user)).replace("{USERNAME}", user.getName()).replace("{ADDRESS}", user.getPlayer().getAddress().toString()); } finally { diff --git a/Essentials/src/net/ess3/utils/textreader/TextInput.java b/Essentials/src/net/ess3/utils/textreader/TextInput.java index d0c208467..a8162b140 100644 --- a/Essentials/src/net/ess3/utils/textreader/TextInput.java +++ b/Essentials/src/net/ess3/utils/textreader/TextInput.java @@ -84,9 +84,9 @@ public class TextInput implements IText if (line.length() > 0 && line.charAt(0) == '#') { bookmarks.put(line.substring(1).toLowerCase(Locale.ENGLISH).replaceAll("&[0-9a-fk]", ""), lineNumber); - chapters.add(line.substring(1).replace('&', '§').replace("§§", "&")); + chapters.add(line.substring(1).replace('&', '\u00a7').replace("\u00a7\u00a7", "&")); } - lines.add(line.replace('&', '§').replace("§§", "&")); + lines.add(line.replace('&', '\u00a7').replace("\u00a7\u00a7", "&")); lineNumber++; } } |