Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2024-11-09 04:02:23 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #316 from mikeprimm/master

Browse Source 
Add escape sequence '&color;' support for webprefix/websuffix - avoid frequent editor code page problems
This commit is contained in:
mikeprimm 2011-07-24 18:32:45 -07:00
commit 4cacc3f92c
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/org/dynmap/Component.java
View File

@ -10,4 +10,12 @@ public abstract class Component {
public void dispose() {
}
/* Substitute proper values for escape sequences */
public static String unescapeString(String v) {
/* Replace color code &color; */
v = v.replaceAll("&color;", "\u00A7");
return v;
}
}

2
src/main/java/org/dynmap/SimpleWebChatComponent.java
View File

@ -19,7 +19,7 @@ public class SimpleWebChatComponent extends Component {
DynmapWebChatEvent evt = new DynmapWebChatEvent(t.source, t.name, t.message);
plugin.getServer().getPluginManager().callEvent(evt);
if(evt.isCancelled() == false)
plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "\u00A72[WEB] ") + t.name + ": " + plugin.configuration.getString("websuffix", "\u00A7f") + t.message);
plugin.getServer().broadcastMessage(unescapeString(plugin.configuration.getString("webprefix", "\u00A72[WEB] ")) + t.name + ": " + unescapeString(plugin.configuration.getString("websuffix", "\u00A7f")) + t.message);
}
});

2
src/main/java/org/dynmap/herochat/HeroWebChatComponent.java
View File

@ -28,7 +28,7 @@ public class HeroWebChatComponent extends Component {
if(evt.isCancelled() == false) {
/* Let HeroChat take a look - only broadcast to players if it doesn't handle it */
if (!handler.sendWebMessageToHeroChat(t.name, t.message)) {
plugin.getServer().broadcastMessage(plugin.configuration.getString("webprefix", "\u00A72[WEB] ") + t.name + ": " + plugin.configuration.getString("websuffix", "\u00A7f") + t.message);
plugin.getServer().broadcastMessage(unescapeString(plugin.configuration.getString("webprefix", "\u00A72[WEB] ")) + t.name + ": " + unescapeString(plugin.configuration.getString("websuffix", "\u00A7f")) + t.message);
}
}
}

7
src/main/resources/configuration.txt
View File

@ -139,8 +139,9 @@ showplayerfacesinmenu: true
joinmessage: "%playername% joined"
quitmessage: "%playername% quit"
spammessage: "You may only chat once every %interval% seconds."
webprefix: "§2[WEB] "
websuffix: "§f"
# webprefix and websuffix support using '&color;' as escape code for color code
webprefix: "&color;2[WEB] "
websuffix: "&color;f"
# Enable checking for banned IPs via banned-ips.txt (internal web server only)
check-banned-ips: true
@ -149,7 +150,7 @@ defaultworld: world
# Set to true to enable verbose startup messages - can help with debugging map configuration problems
# Set to false for a much quieter startup log
verbose: true
verbose: false
# Enables debugging.
#debuggers: