--- miscJava/bukkit-minecraft-plugins/HoerupUtils/src/dk/thoerup/bukkit/hoeruputils/web/StatusListener.java	2011/12/21 19:19:02	1667
+++ miscJava/bukkit-minecraft-plugins/HoerupUtils/src/main/java/dk/thoerup/bukkit/hoeruputils/web/StatusListener.java	2012/01/27 12:21:27	1684
@@ -5,6 +5,7 @@
 import java.util.Date;
 import java.util.Set;
 import java.util.Map;
+import org.bukkit.Location;
 import org.bukkit.Server;
 import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
@@ -21,10 +22,15 @@
 
 	Server server;
 	Configuration loginConfig;
+	Configuration homeConfig;
 
-	public StatusListener(Server server, Configuration loginConfig) {
+	long cachedTime = 0;
+	String cachedXml = "";
+
+	public StatusListener(Server server, Configuration loginConfig, Configuration homeConfig) {
 		this.server = server;
 		this.loginConfig = loginConfig;		
+		this.homeConfig = homeConfig;
 	}
 
 	String formatTime(String input) {
@@ -40,6 +46,27 @@
 		if(!event.path[0].equalsIgnoreCase("webstatus")) {
 			return;
 		}
+
+		String xml;
+
+		synchronized(this) { //is this necessary ?
+			long now = System.currentTimeMillis();
+			if ( (now-cachedTime) > 5000) {
+				xml = buildXML();
+				cachedXml = xml;
+				cachedTime = now;
+			} else {
+				xml = cachedXml;
+			}
+		}
+			
+
+		event.setResponse(xml);
+		event.setActionTaken(true);
+	}
+	
+	private String buildXML() {
+
 		StringBuilder sb = new StringBuilder();
 
 		sb.append("<?xml version=\"1.0\"?> \n");
@@ -57,46 +84,69 @@
 
 
 		long now = System.currentTimeMillis();
-		sb.append("<onlineplayers>\n");			
-		for (Player p : server.getOnlinePlayers()) {
-			long login = loginConfig.getLong( p.getName() + ".logintime", -1);
-			long elapsed = (now-login) / 1000;
-
-			sb.append("<player>\n");
-			sb.append("<name>" + p.getName() + "</name>\n" );
-			sb.append("<sessionlength>" + elapsed + "</sessionlength>\n" );
-			sb.append("</player>\n");
-		}
-		sb.append("</onlineplayers>");
 
-
-		sb.append("<offlineplayers>\n");
+		sb.append("<players>\n");
 		OfflinePlayer playerList[] = server.getOfflinePlayers();
 		for (OfflinePlayer player : playerList) {
 			long first = player.getFirstPlayed();
 			long last = player.getLastPlayed();	
 
-			sb.append("<offlineplayer>\n");
+
+			sb.append("<player>\n");
 			sb.append("<name>" + player.getName() + "</name>\n" );
+
 			sb.append("<firstseen>" + formatTime(first) + "</firstseen>\n");
 			sb.append("<lastseen>" + formatTime(last) + "</lastseen>\n");
-			sb.append("</offlineplayer>\n");
-		}
-		sb.append("</offlineplayers>\n");
 
+			sb.append("<online>" + (player.isOnline() ? 1 : 0 )  + "</online>\n" );
+
+			if (player.isOnline() ) {		
+				long login = loginConfig.getLong( player.getName() + ".logintime", -1);
+				long elapsed = (login>-1 ? (now-login) / 1000 : -1);
+
+				Player p2 = server.getPlayer( player.getName() );
+				Location loc = p2.getLocation();
+
+				sb.append("<sessionlength>" + elapsed + "</sessionlength>\n" );
+				sb.append("<ip>" + p2.getAddress().getAddress().toString().replace("/","") + "</ip>\n" );
+				sb.append("<location>");
+				sb.append("<x>" + loc.getBlockX() + "</x>");
+				sb.append("<y>" + loc.getBlockY() + "</y>");
+				sb.append("<z>" + loc.getBlockZ() + "</z>");
+				sb.append("<world>" + loc.getWorld().getName() + "</world>");
+				sb.append("</location>");			
+			}
+
+			String homeWorld = homeConfig.getString( player.getName() + ".world");
+			if (homeWorld != null) {
+				sb.append("<home>");
+				sb.append("<world>" + homeWorld + "</world>\n");
+				sb.append("<x>" + (int)homeConfig.getDouble(player.getName() + ".x") + "</x>\n");
+				sb.append("<y>" + (int)homeConfig.getDouble(player.getName() + ".y") + "</y>\n");
+				sb.append("<z>" + (int)homeConfig.getDouble(player.getName() + ".z") + "</z>\n");
+				sb.append("</home>");
+
+			}
+
+
+			sb.append("</player>\n");
+		}
+		sb.append("</players>\n");
 			
 		sb.append("<plugins>\n");
 		for (Plugin plugin : server.getPluginManager().getPlugins()) {
+
 			sb.append("<plugin>\n");	
 			sb.append("<name>" + plugin.getDescription().getName() + "</name>\n");
 			sb.append("<version>" + plugin.getDescription().getVersion() + "</version>\n");
+			sb.append("<website>" + (plugin.getDescription().getWebsite() != null ? plugin.getDescription().getWebsite() : "") + "</website>\n");
 			sb.append("</plugin>\n");	
 		}
 		sb.append("</plugins>\n");
 							
 		sb.append("</serverinfo>");			
-		event.setResponse(sb.toString());
-		event.setActionTaken(true);
+
+		return sb.toString();
 		
 	}