From b6cff41473b8715e1ef72be473b55f39cccfbd2a Mon Sep 17 00:00:00 2001
From: Thinkofdeath <thinkofdeath@spigotmc.org>
Date: Tue, 2 Dec 2014 15:13:07 +0000
Subject: SPIGOT-96/BUKKIT-5016: Fix thunder storms not darkening the sky and
 transitions being broken.

---
 nms-patches/World.patch | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

(limited to 'nms-patches/World.patch')

diff --git a/nms-patches/World.patch b/nms-patches/World.patch
index 57db4a9e..3131a603 100644
--- a/nms-patches/World.patch
+++ b/nms-patches/World.patch
@@ -1,5 +1,5 @@
---- ../work/decompile-8eb82bde//net/minecraft/server/World.java	2014-11-29 21:17:20.461017061 +0000
-+++ src/main/java/net/minecraft/server/World.java	2014-11-29 21:17:07.617017346 +0000
+--- ../work/decompile-8eb82bde//net/minecraft/server/World.java	2014-12-02 15:12:18.222036228 +0000
++++ src/main/java/net/minecraft/server/World.java	2014-12-02 15:04:12.678047004 +0000
 @@ -13,6 +13,22 @@
  import java.util.UUID;
  import java.util.concurrent.Callable;
@@ -441,7 +441,18 @@
                      }
                  }
  
-@@ -1656,7 +1886,7 @@
+@@ -1651,12 +1881,18 @@
+                 }
+ 
+                 this.p = MathHelper.a(this.p, 0.0F, 1.0F);
++                
++                for (int idx = 0; idx < this.players.size(); ++idx) {
++                    if (((EntityPlayer) this.players.get(idx)).world == this) {
++                        ((EntityPlayer) this.players.get(idx)).tickWeather();
++                    }
++                }
+             }
+         }
      }
  
      protected void D() {
@@ -450,7 +461,7 @@
          this.methodProfiler.a("buildList");
  
          int i;
-@@ -1673,7 +1903,7 @@
+@@ -1673,7 +1909,7 @@
  
              for (int i1 = -l; i1 <= l; ++i1) {
                  for (int j1 = -l; j1 <= l; ++j1) {
@@ -459,7 +470,7 @@
                  }
              }
          }
-@@ -1851,7 +2081,10 @@
+@@ -1851,7 +2087,10 @@
      }
  
      public boolean c(EnumSkyBlock enumskyblock, BlockPosition blockposition) {
@@ -471,7 +482,7 @@
              return false;
          } else {
              int i = 0;
-@@ -2095,8 +2328,17 @@
+@@ -2095,8 +2334,17 @@
  
          while (iterator.hasNext()) {
              Entity entity = (Entity) iterator.next();
@@ -490,7 +501,7 @@
                  ++i;
              }
          }
-@@ -2105,12 +2347,17 @@
+@@ -2105,12 +2353,17 @@
      }
  
      public void b(Collection collection) {
@@ -510,7 +521,7 @@
              this.a(entity);
          }
  
-@@ -2124,7 +2371,13 @@
+@@ -2124,7 +2377,13 @@
          Block block1 = this.getType(blockposition).getBlock();
          AxisAlignedBB axisalignedbb = flag ? null : block.a(this, blockposition, block.getBlockData());
  
@@ -525,7 +536,7 @@
      }
  
      public int getBlockPower(BlockPosition blockposition, EnumDirection enumdirection) {
-@@ -2215,6 +2468,11 @@
+@@ -2215,6 +2474,11 @@
  
          for (int i = 0; i < this.players.size(); ++i) {
              EntityHuman entityhuman1 = (EntityHuman) this.players.get(i);
@@ -537,7 +548,7 @@
  
              if (IEntitySelector.d.apply(entityhuman1)) {
                  double d5 = entityhuman1.e(d0, d1, d2);
-@@ -2269,7 +2527,7 @@
+@@ -2269,7 +2533,7 @@
          return null;
      }
  
@@ -546,7 +557,7 @@
          this.dataManager.checkSession();
      }
  
-@@ -2331,6 +2589,16 @@
+@@ -2331,6 +2595,16 @@
  
      public void everyoneSleeping() {}
  
@@ -563,7 +574,7 @@
      public float h(float f) {
          return (this.q + (this.r - this.q) * f) * this.j(f);
      }
-@@ -2538,6 +2806,6 @@
+@@ -2538,6 +2812,6 @@
          int l = j * 16 + 8 - blockposition.getZ();
          short short0 = 128;
  
-- 
cgit v1.2.3