Paper/nms-patches/WorldData.patch

--- /home/matt/mc-dev-private//net/minecraft/server/WorldData.java	2015-05-05 21:41:21.384628182 +0100
+++ src/main/java/net/minecraft/server/WorldData.java	2015-05-05 21:41:21.384628182 +0100
@@ -1,6 +1,11 @@
 package net.minecraft.server;
 
 import java.util.concurrent.Callable;
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
+// CraftBukkit end
 
 public class WorldData {
 
@@ -41,6 +46,7 @@
     private int I;
     private int J;
     private GameRules K;
+    public WorldServer world; // CraftBukkit
 
     protected WorldData() {
         this.c = WorldType.NORMAL;
@@ -395,6 +401,18 @@
     }
 
     public void setThundering(boolean flag) {
+        // CraftBukkit start
+        org.bukkit.World world = Bukkit.getWorld(getName());
+        if (world != null) {
+            ThunderChangeEvent thunder = new ThunderChangeEvent(world, flag);
+            Bukkit.getServer().getPluginManager().callEvent(thunder);
+            if (thunder.isCancelled()) {
+                return;
+            }
+
+            setThunderDuration(0); // Will force a time reset
+        }
+        // CraftBukkit end
         this.s = flag;
     }
 
@@ -411,6 +429,18 @@
     }
 
     public void setStorm(boolean flag) {
+        // CraftBukkit start
+        org.bukkit.World world = Bukkit.getWorld(getName());
+        if (world != null) {
+            WeatherChangeEvent weather = new WeatherChangeEvent(world, flag);
+            Bukkit.getServer().getPluginManager().callEvent(weather);
+            if (weather.isCancelled()) {
+                return;
+            }
+
+            setWeatherDuration(0); // Will force a time reset
+        }
+        // CraftBukkit end
         this.q = flag;
     }
 
@@ -556,6 +586,12 @@
 
     public void setDifficulty(EnumDifficulty enumdifficulty) {
         this.z = enumdifficulty;
+        // CraftBukkit start
+        PacketPlayOutServerDifficulty packet = new PacketPlayOutServerDifficulty(this.getDifficulty(), this.isDifficultyLocked());
+        for (EntityPlayer player : (java.util.List<EntityPlayer>) (java.util.List) world.players) {
+            player.playerConnection.sendPacket(packet);
+        }
+        // CraftBukkit end
     }
 
     public boolean isDifficultyLocked() {
@@ -664,4 +700,12 @@
             }
         });
     }
+
+    // CraftBukkit start - Check if the name stored in NBT is the correct one
+    public void checkName( String name ) {
+        if ( !this.n.equals( name ) ) {
+            this.n = name;
+        }
+    }
+    // CraftBukkit end
 }