diff options
| author | md_5 <git@md-5.net> | 2015-01-13 20:40:23 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-01-13 20:40:23 +1100 |
| commit | 93e7b199bd213eeb66004961c167951b24d246e9 (patch) | |
| tree | 92dda450fc1418b80e0679e4ecb2be79c0cfcca0 /nms-patches | |
| parent | 0643caa8883535174f3e7672b5514525b23a0fbf (diff) | |
| download | craftbukkit-93e7b199bd213eeb66004961c167951b24d246e9.tar craftbukkit-93e7b199bd213eeb66004961c167951b24d246e9.tar.gz craftbukkit-93e7b199bd213eeb66004961c167951b24d246e9.tar.lz craftbukkit-93e7b199bd213eeb66004961c167951b24d246e9.tar.xz craftbukkit-93e7b199bd213eeb66004961c167951b24d246e9.zip | |
Fix the CraftWorld weather methods duplicating events.
Diffstat (limited to 'nms-patches')
| -rw-r--r-- | nms-patches/WorldData.patch | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/nms-patches/WorldData.patch b/nms-patches/WorldData.patch index 877ae674..74f093fb 100644 --- a/nms-patches/WorldData.patch +++ b/nms-patches/WorldData.patch @@ -1,5 +1,5 @@ ---- ../work/decompile-8eb82bde/net/minecraft/server/WorldData.java 2015-01-05 09:50:01.989188327 +1100 -+++ src/main/java/net/minecraft/server/WorldData.java 2015-01-05 09:50:01.993188321 +1100 +--- ../work/decompile-8eb82bde/net/minecraft/server/WorldData.java 2015-01-13 20:36:38.880978444 +1100 ++++ src/main/java/net/minecraft/server/WorldData.java 2015-01-13 20:36:38.880978444 +1100 @@ -1,6 +1,9 @@ package net.minecraft.server; @@ -10,7 +10,7 @@ public class WorldData { -@@ -395,6 +398,16 @@ +@@ -395,6 +398,18 @@ } public void setThundering(boolean flag) { @@ -22,12 +22,14 @@ + if (thunder.isCancelled()) { + return; + } ++ ++ setThunderDuration(0); // Will force a time reset + } + // CraftBukkit end this.s = flag; } -@@ -411,6 +424,16 @@ +@@ -411,6 +426,18 @@ } public void setStorm(boolean flag) { @@ -39,12 +41,14 @@ + if (weather.isCancelled()) { + return; + } ++ ++ setWeatherDuration(0); // Will force a time reset + } + // CraftBukkit end this.q = flag; } -@@ -645,4 +668,12 @@ +@@ -645,4 +672,12 @@ static boolean q(WorldData worlddata) { return worlddata.x; } |