summaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2017-06-09 16:17:08 +1000
committermd_5 <git@md-5.net>2017-06-09 16:17:08 +1000
commited8c725d1906b97ab83eaeef4b6acf187c90575a (patch)
treed879b15193aa682d3bdd97a5c5345ec388684619 /src/main/java
parent2c34c38d7a521ad6808e7b962c086a63d13b1516 (diff)
downloadcraftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar
craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar.gz
craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar.lz
craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar.xz
craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.zip
SPIGOT-3304: Respect duration from Vanilla /weather
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/CraftWorld.java2
1 files changed, 2 insertions, 0 deletions
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() {