From abab38526aab6446b0cc3001d706a42ae4ea4c5a Mon Sep 17 00:00:00 2001 From: md_5 Date: Fri, 26 Apr 2019 14:42:51 +1000 Subject: [PATCH] SPIGOT-4765: WeatherChangeEvent occurs every tick --- nms-patches/WorldData.patch | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/nms-patches/WorldData.patch b/nms-patches/WorldData.patch index 7519982eb3..5f0a6d82bd 100644 --- a/nms-patches/WorldData.patch +++ b/nms-patches/WorldData.patch @@ -28,11 +28,15 @@ } public long getSeed() { -@@ -508,6 +515,16 @@ +@@ -508,6 +515,20 @@ } public void setThundering(boolean flag) { + // CraftBukkit start ++ if (this.z == flag) { ++ return; ++ } ++ + org.bukkit.World world = Bukkit.getWorld(getName()); + if (world != null) { + ThunderChangeEvent thunder = new ThunderChangeEvent(world, flag); @@ -45,11 +49,15 @@ this.z = flag; } -@@ -524,6 +541,16 @@ +@@ -524,6 +545,20 @@ } public void setStorm(boolean flag) { + // CraftBukkit start ++ if (this.x == flag) { ++ return; ++ } ++ + org.bukkit.World world = Bukkit.getWorld(getName()); + if (world != null) { + WeatherChangeEvent weather = new WeatherChangeEvent(world, flag); @@ -62,7 +70,7 @@ this.x = flag; } -@@ -673,6 +700,12 @@ +@@ -673,6 +708,12 @@ public void setDifficulty(EnumDifficulty enumdifficulty) { this.G = enumdifficulty; @@ -75,7 +83,7 @@ } public boolean isDifficultyLocked() { -@@ -777,4 +810,12 @@ +@@ -777,4 +818,12 @@ public void a(UUID uuid) { this.X = uuid; }