From ed8c725d1906b97ab83eaeef4b6acf187c90575a Mon Sep 17 00:00:00 2001
From: md_5 <git@md-5.net>
Date: Fri, 9 Jun 2017 16:17:08 +1000
Subject: SPIGOT-3304: Respect duration from Vanilla /weather

---
 src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/main/java')

diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 2574bee4..b3276695 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -771,6 +771,7 @@ public class CraftWorld implements World {
 
     public void setStorm(boolean hasStorm) {
         world.worldData.setStorm(hasStorm);
+        setWeatherDuration(0); // Reset weather duration (legacy behaviour)
     }
 
     public int getWeatherDuration() {
@@ -787,6 +788,7 @@ public class CraftWorld implements World {
 
     public void setThundering(boolean thundering) {
         world.worldData.setThundering(thundering);
+        setThunderDuration(0); // Reset weather duration (legacy behaviour)
     }
 
     public int getThunderDuration() {
-- 
cgit v1.2.3