Upstream/dynmap
1
0
Fork 0
mirror of https://github.com/webbukkit/dynmap.git synced 2025-02-26 00:31:44 +01:00
Code Issues Projects Releases Wiki Activity

Removed redundant configuration values and made use of customizable join/quit messages.

Browse Source
This commit is contained in:
FrozenCow 2011-04-05 22:30:43 +02:00
parent d4a2d2d32f
commit e1e13df4b2
5 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configuration.txt
View File

@ -61,19 +61,14 @@ worlds:
web: web:
# Handles the clientside updates differently only enable if using jsonfile # Handles the clientside updates differently only enable if using jsonfile
jsonfile: false jsonfile: false
# Interval the browser should poll for updates. # Interval the browser should poll for updates.
updaterate: 2000 updaterate: 2000
showchatballoons: false allowchat: true
focuschatballoons: false
showchatwindow: true
allowwebchat: true allowwebchat: true
webchat-interval: 5 webchat-interval: 5
messagettl: 15
showplayerfacesonmap: true
showplayerfacesinmenu: true showplayerfacesinmenu: true
joinmessage: "%playername% joined" joinmessage: "%playername% joined"

4
src/main/java/org/dynmap/DynmapPlayerChatListener.java
View File

@ -20,14 +20,14 @@ public class DynmapPlayerChatListener extends PlayerListener {
@Override @Override
public void onPlayerJoin(PlayerJoinEvent event) { public void onPlayerJoin(PlayerJoinEvent event) {
String joinMessage = plugin.configuration.getString("joinmessage", "%playername% joined"); String joinMessage = plugin.configuration.getNode("web").getString("joinmessage", "%playername% joined");
joinMessage = joinMessage.replaceAll("%playername%", event.getPlayer().getName()); joinMessage = joinMessage.replaceAll("%playername%", event.getPlayer().getName());
plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", joinMessage)); plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", joinMessage));
} }
@Override @Override
public void onPlayerQuit(PlayerQuitEvent event) { public void onPlayerQuit(PlayerQuitEvent event) {
String quitMessage = plugin.configuration.getString("quitmessage", "%playername% quit"); String quitMessage = plugin.configuration.getNode("web").getString("quitmessage", "%playername% quit");
quitMessage = quitMessage.replaceAll("%playername%", event.getPlayer().getName()); quitMessage = quitMessage.replaceAll("%playername%", event.getPlayer().getName());
plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", quitMessage)); plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", quitMessage));
} }

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

@ -235,7 +235,7 @@ public class DynmapPlugin extends JavaPlugin {
} }
// To announce when players have joined/quit/chatted. // To announce when players have joined/quit/chatted.
if (configuration.getNode("web").getBoolean("showchatballoons", false) || configuration.getNode("web").getBoolean("showchatwindow", false)) { if (configuration.getNode("web").getBoolean("allowchat", false)) {
// To handle webchat. // To handle webchat.
PlayerListener playerListener = new DynmapPlayerChatListener(this); PlayerListener playerListener = new DynmapPlayerChatListener(this);
//getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this); //getServer().getPluginManager().registerEvent(Event.Type.PLAYER_COMMAND, playerListener, Priority.Normal, this);

18
src/main/java/org/dynmap/web/handlers/SendMessageHandler.java
View File

@ -67,21 +67,9 @@ public class SendMessageHandler implements HttpHandler {
disallowedUsers.put(user.name, user); disallowedUsers.put(user.name, user);
disallowedUserQueue.add(user); disallowedUserQueue.add(user);
} else { } else {
spamMessage = spamMessage.replaceAll("%interval%", Integer.toString(maximumMessageInterval/1000)); response.fields.put("Content-Length", "0");
byte[] stringBytes = spamMessage.getBytes(); response.status = HttpStatus.Forbidden;
String dateStr = new Date().toString(); response.getBody();
response.fields.put("Date", dateStr);
response.fields.put("Content-Type", "text/plain");
response.fields.put("Expires", "Thu, 01 Dec 1994 16:00:00 GMT");
response.fields.put("Last-modified", dateStr);
response.fields.put("Content-Length", Integer.toString(stringBytes.length));
response.status = HttpStatus.OK;
BufferedOutputStream out = null;
out = new BufferedOutputStream(response.getBody());
out.write(stringBytes);
out.flush();
return; return;
} }
} }

5
web/js/chat.js
View File

@ -34,6 +34,11 @@ componentconstructors['chat'] = function(dynmap, configuration) {
if(response) { if(response) {
$(dynmap).trigger('chat', [{source: 'me', name: ip, text: message}]); $(dynmap).trigger('chat', [{source: 'me', name: ip, text: message}]);
} }
},
error: function(xhr) {
if (xhr.status === 403) {
$(dynmap).trigger('chat', [{source: 'me', name: 'Error', text: dynmap.options.spammessage.replace('%interval%', dynmap.options['webchat-interval'])}]);
}
} }
}); });
}); });