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

Fix client side timestamp problem

Browse source 
Added Support for standalone webchat by reading a json file
Fix for jsonfile-interval in code
Added working php script with spam prevention, for webchat
This commit is contained in:
Jason Booth 2011-03-10 00:11:43 -06:00
parent 965686d44c
commit d296724755
5 changed files with 102 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

63
src/main/java/org/dynmap/JsonTimerTask.java
View file

@ -3,7 +3,9 @@ package org.dynmap;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
import java.util.Iterator;
import java.util.TimerTask;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -13,7 +15,12 @@ import org.bukkit.Server;
import org.bukkit.World;
import org.bukkit.entity.Player;
import org.bukkit.util.config.Configuration;
import org.dynmap.Event;
import org.dynmap.web.Json;
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
import org.json.simple.parser.ParseException;
class JsonTimerTask extends TimerTask {
protected static final Logger log = Logger.getLogger("Minecraft");
@ -22,6 +29,8 @@ class JsonTimerTask extends TimerTask {
private Server server;
private MapManager mapManager;
private Configuration configuration;
private static final JSONParser parser = new JSONParser();
private long lastTimestamp = 0;
public JsonTimerTask(DynmapPlugin instance, Configuration config) {
this.plugin = instance;
@ -31,8 +40,48 @@ class JsonTimerTask extends TimerTask {
}
public void run() {
long jsonInterval = configuration.getInt("jsonfile-interval", 1) * 1000;
long current = System.currentTimeMillis();
File outputFile;
//Handles Reading WebChat
if(configuration.getNode("web").getBoolean("allowwebchat", false))
{
File webChatPath = new File(this.configuration.getString("webpath", "web"), "standalone/dynmap_webchat.json");
if (webChatPath.isAbsolute())
outputFile = webChatPath;
else {
outputFile = new File(plugin.getDataFolder(), webChatPath.toString());
}
if(webChatPath.exists() && lastTimestamp != 0)
{
JSONArray jsonMsgs = null;
try {
FileReader inputFileReader = new FileReader(webChatPath);
jsonMsgs = (JSONArray) parser.parse(inputFileReader);
inputFileReader.close();
} catch(IOException ex){
log.log(Level.SEVERE, "Exception while reading JSON-file.", ex);
} catch(ParseException ex) {
log.log(Level.SEVERE, "Exception while parsing JSON-file.", ex);
}
if(jsonMsgs != null) {
Iterator iter = jsonMsgs.iterator();
while(iter.hasNext()) {
JSONObject o = (JSONObject)iter.next();
if(Long.parseLong(String.valueOf(o.get("timestamp"))) >= (lastTimestamp))
{
plugin.webChat(String.valueOf(o.get("name")), String.valueOf(o.get("message")));
}
}
}
}
}
//Handles Updates
for (World world : this.server.getWorlds()) {
long current = System.currentTimeMillis();
current = System.currentTimeMillis();
Client.Update update = new Client.Update();
@ -47,14 +96,13 @@ class JsonTimerTask extends TimerTask {
update.players[i] = new Client.Player(p.getName(), pl.getWorld().getName(), pl.getX(), pl.getY(), pl.getZ());
}
update.updates = mapManager.getWorldUpdates(world.getName(), current - (configuration.getInt("jsonfile-interval", 1) + 10000));
update.updates = mapManager.getWorldUpdates(world.getName(), current - (jsonInterval + 10000));
File webpath = new File(this.configuration.getString("webpath", "web"), "dynmap_" + world.getName() + ".json");
File outputFile;
if (webpath.isAbsolute())
outputFile = webpath;
File webWorldPath = new File(this.configuration.getString("webpath", "web"), "standalone/dynmap_" + world.getName() + ".json");
if (webWorldPath.isAbsolute())
outputFile = webWorldPath;
else {
outputFile = new File(plugin.getDataFolder(), webpath.toString());
outputFile = new File(plugin.getDataFolder(), webWorldPath.toString());
}
try {
FileOutputStream fos = new FileOutputStream(outputFile);
@ -66,5 +114,6 @@ class JsonTimerTask extends TimerTask {
log.log(Level.SEVERE, "Exception while writing JSON-file.", ioe);
}
}
lastTimestamp = System.currentTimeMillis();
}
}