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

Merge remote-tracking branch 'kilandor/master' into nowebserver

Browse source 
Conflicts:
	configuration.txt
	src/main/java/org/dynmap/DynmapPlayerListener.java
	src/main/java/org/dynmap/DynmapPlugin.java
	web/map.js
This commit is contained in:
FrozenCow 2011-02-22 17:58:39 +01:00
commit 1cc43637ee
5 changed files with 144 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -23,7 +23,11 @@ public class Client {
}
}
public static class ChatMessage {
public static class Stamped {
public long timestamp = System.currentTimeMillis();
}
public static class ChatMessage extends Stamped {
public String type = "chat";
public String playerName;
public String message;
@ -34,7 +38,7 @@ public class Client {
}
}
public static class WebChatMessage {
public static class WebChatMessage extends Stamped {
public String type = "webchat";
public String playerName;
public String message;
@ -45,7 +49,7 @@ public class Client {
}
}
public static class Tile {
public static class Tile extends Stamped {
public String type = "tile";
public String name;