Sulkta-OSS/dynmap-neoforge
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleaned up join/quit messages (not being send as chat messages)

Browse source
This commit is contained in:
FrozenCow 2011-04-05 22:58:46 +02:00
parent e1e13df4b2
commit b47bbee4e8
6 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/main/java/org/dynmap/Client.java
View file

@ -29,23 +29,30 @@ public class Client {
public static class ChatMessage extends Stamped {
public String type = "chat";
public String source;
public String playerName;
public String message;
public ChatMessage(String playerName, String message) {
public ChatMessage(String source, String playerName, String message) {
this.source = source;
this.playerName = playerName;
this.message = message;
}
}
public static class WebChatMessage extends Stamped {
public String type = "webchat";
public static class PlayerJoinMessage extends Stamped {
public String type = "playerjoin";
public String playerName;
public String message;
public WebChatMessage(String playerName, String message) {
public PlayerJoinMessage(String playerName) {
this.playerName = playerName;
}
}
public static class PlayerQuitMessage extends Stamped {
public String type = "playerquit";
public String playerName;
public PlayerQuitMessage(String playerName) {
this.playerName = playerName;
this.message = message;
}
}

10
src/main/java/org/dynmap/DynmapPlayerChatListener.java
View file

@ -15,21 +15,17 @@ public class DynmapPlayerChatListener extends PlayerListener {
@Override
public void onPlayerChat(PlayerChatEvent event) {
if(event.isCancelled()) return;
plugin.mapManager.pushUpdate(new Client.ChatMessage(event.getPlayer().getName(), event.getMessage()));
plugin.mapManager.pushUpdate(new Client.ChatMessage("player", event.getPlayer().getName(), event.getMessage()));
}
@Override
public void onPlayerJoin(PlayerJoinEvent event) {
String joinMessage = plugin.configuration.getNode("web").getString("joinmessage", "%playername% joined");
joinMessage = joinMessage.replaceAll("%playername%", event.getPlayer().getName());
plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", joinMessage));
plugin.mapManager.pushUpdate(new Client.PlayerJoinMessage(event.getPlayer().getName()));
}
@Override
public void onPlayerQuit(PlayerQuitEvent event) {
String quitMessage = plugin.configuration.getNode("web").getString("quitmessage", "%playername% quit");
quitMessage = quitMessage.replaceAll("%playername%", event.getPlayer().getName());
plugin.mapManager.pushUpdate(new Client.ChatMessage("Server", quitMessage));
plugin.mapManager.pushUpdate(new Client.PlayerQuitMessage(event.getPlayer().getName()));
}
}

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

@ -382,7 +382,7 @@ public class DynmapPlugin extends JavaPlugin {
}
public void webChat(String name, String message) {
mapManager.pushUpdate(new Client.WebChatMessage(name, message));
mapManager.pushUpdate(new Client.ChatMessage("web", name, message));
log.info("[WEB]" + name + ": " + message);
getServer().broadcastMessage("[WEB]" + name + ": " + message);
}