From bb45cc10cb559ee6a66502e88e12bcd7646a4c44 Mon Sep 17 00:00:00 2001
From: zeeZ <zeeZinator+github@gmail.com>
Date: Mon, 9 May 2011 04:57:28 +0200
Subject: [PATCH] Added weather to json world output (hasStorm and
 isThundering)

---
 src/main/java/org/dynmap/Client.java                           | 2 ++
 src/main/java/org/dynmap/JsonTimerTask.java                    | 2 ++
 src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java | 2 ++
 3 files changed, 6 insertions(+)

diff --git a/src/main/java/org/dynmap/Client.java b/src/main/java/org/dynmap/Client.java
index 28a3deb7..307784c7 100644
--- a/src/main/java/org/dynmap/Client.java
+++ b/src/main/java/org/dynmap/Client.java
@@ -6,6 +6,8 @@ public class Client {
     public static class Update {
         public long timestamp;
         public long servertime;
+        public boolean hasStorm;
+        public boolean isThundering;
         public Player[] players;
         public Object[] updates;
     }
diff --git a/src/main/java/org/dynmap/JsonTimerTask.java b/src/main/java/org/dynmap/JsonTimerTask.java
index dd88ffcf..4f732097 100644
--- a/src/main/java/org/dynmap/JsonTimerTask.java
+++ b/src/main/java/org/dynmap/JsonTimerTask.java
@@ -96,6 +96,8 @@ class JsonTimerTask extends TimerTask {
 
             update.timestamp = current;
             update.servertime = world.getTime() % 24000;
+            update.hasStorm = world.hasStorm();
+            update.isThundering = world.isThundering();
 
             Player[] players = plugin.playerList.getVisiblePlayers();
             update.players = new Client.Player[players.length];
diff --git a/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java b/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
index 04c201d6..09d57459 100644
--- a/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
+++ b/src/main/java/org/dynmap/web/handlers/ClientUpdateHandler.java
@@ -64,6 +64,8 @@ public class ClientUpdateHandler implements HttpHandler {
         Client.Update update = new Client.Update();
         update.timestamp = current;
         update.servertime = world.getTime() % 24000;
+        update.hasStorm = world.hasStorm();
+        update.isThundering = world.isThundering();
         
         
         Player[] players = playerList.getVisiblePlayers();