From e1ebdd927adb21274350d6ae6273c9da7911d033 Mon Sep 17 00:00:00 2001 From: Parker Hawke Date: Thu, 26 Nov 2020 10:08:19 +1100 Subject: [PATCH] #771: Add clear weather World API --- .../java/org/bukkit/craftbukkit/CraftWorld.java | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 233713588..ec88f571a 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -1283,6 +1283,7 @@ public class CraftWorld implements World { public void setStorm(boolean hasStorm) { world.worldData.setStorm(hasStorm); setWeatherDuration(0); // Reset weather duration (legacy behaviour) + setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands) } @Override @@ -1304,6 +1305,7 @@ public class CraftWorld implements World { public void setThundering(boolean thundering) { world.worldDataServer.setThundering(thundering); setThunderDuration(0); // Reset weather duration (legacy behaviour) + setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands) } @Override @@ -1316,6 +1318,21 @@ public class CraftWorld implements World { world.worldDataServer.setThunderDuration(duration); } + @Override + public boolean isClearWeather() { + return !this.hasStorm() && !this.isThundering(); + } + + @Override + public void setClearWeatherDuration(int duration) { + world.worldDataServer.a(duration); // PAIL rename setClearWeatherDuration + } + + @Override + public int getClearWeatherDuration() { + return world.worldDataServer.h(); // PAIL rename getClearWeatherDuration + } + @Override public long getSeed() { return world.getSeed();