diff options
| author | md_5 <git@md-5.net> | 2017-06-09 16:17:08 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2017-06-09 16:17:08 +1000 |
| commit | ed8c725d1906b97ab83eaeef4b6acf187c90575a (patch) | |
| tree | d879b15193aa682d3bdd97a5c5345ec388684619 | |
| parent | 2c34c38d7a521ad6808e7b962c086a63d13b1516 (diff) | |
| download | craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar.gz craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar.lz craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.tar.xz craftbukkit-ed8c725d1906b97ab83eaeef4b6acf187c90575a.zip | |
SPIGOT-3304: Respect duration from Vanilla /weather
| -rw-r--r-- | nms-patches/WorldData.patch | 12 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 2 |
2 files changed, 6 insertions, 8 deletions
diff --git a/nms-patches/WorldData.patch b/nms-patches/WorldData.patch index 83b28f66..d81876aa 100644 --- a/nms-patches/WorldData.patch +++ b/nms-patches/WorldData.patch @@ -20,7 +20,7 @@ protected WorldData() { this.f = WorldType.NORMAL; -@@ -437,6 +443,18 @@ +@@ -437,6 +443,16 @@ } public void setThundering(boolean flag) { @@ -32,14 +32,12 @@ + if (thunder.isCancelled()) { + return; + } -+ -+ setThunderDuration(0); // Will force a time reset + } + // CraftBukkit end this.v = flag; } -@@ -453,6 +471,18 @@ +@@ -453,6 +469,16 @@ } public void setStorm(boolean flag) { @@ -51,14 +49,12 @@ + if (weather.isCancelled()) { + return; + } -+ -+ setWeatherDuration(0); // Will force a time reset + } + // CraftBukkit end this.t = flag; } -@@ -598,6 +628,12 @@ +@@ -598,6 +624,12 @@ public void setDifficulty(EnumDifficulty enumdifficulty) { this.C = enumdifficulty; @@ -71,7 +67,7 @@ } public boolean isDifficultyLocked() { -@@ -716,4 +752,12 @@ +@@ -716,4 +748,12 @@ public void a(DimensionManager dimensionmanager, NBTTagCompound nbttagcompound) { this.N.put(dimensionmanager, nbttagcompound); } 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() { |