From a163a97e1cd7068beb1936d9800a4c71215f0daf Mon Sep 17 00:00:00 2001 From: CraftBukkit/Spigot Date: Sat, 10 Dec 2011 12:20:24 -0500 Subject: [PATCH] Linked thundering and storming. By: EvilSeph --- .../src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 553bb1bd5..45035b0e2 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -590,10 +590,11 @@ public class CraftWorld implements World { } public boolean isThundering() { - return world.worldData.isThundering(); + return hasStorm() && world.worldData.isThundering(); } public void setThundering(boolean thundering) { + if (thundering && !hasStorm()) setStorm(true); CraftServer server = world.getServer(); ThunderChangeEvent thunder = new ThunderChangeEvent((org.bukkit.World) this, thundering); @@ -886,9 +887,9 @@ public class CraftWorld implements World { if (getClass() != obj.getClass()) { return false; } - + final CraftWorld other = (CraftWorld) obj; - + return this.getUID() == other.getUID(); }