2021-06-11 14:02:28 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Wed, 2 Dec 2020 18:23:26 -0800
|
|
|
|
Subject: [PATCH] Add cause to Weather/ThunderChangeEvents
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2023-03-14 18:11:24 +01:00
|
|
|
index 3d4eff26f6530d11821ba09953095036bce3a2d3..abc3041f363287f0596b05004b0d4c5408c8820e 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/server/level/ServerLevel.java
|
|
|
|
+++ b/src/main/java/net/minecraft/server/level/ServerLevel.java
|
2022-12-19 11:46:55 +01:00
|
|
|
@@ -531,8 +531,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
2021-06-15 04:59:31 +02:00
|
|
|
this.serverLevelData.setClearWeatherTime(clearDuration);
|
|
|
|
this.serverLevelData.setRainTime(rainDuration);
|
|
|
|
this.serverLevelData.setThunderTime(rainDuration);
|
|
|
|
- this.serverLevelData.setRaining(raining);
|
|
|
|
- this.serverLevelData.setThundering(thundering);
|
|
|
|
+ this.serverLevelData.setRaining(raining, org.bukkit.event.weather.WeatherChangeEvent.Cause.COMMAND); // Paper
|
|
|
|
+ this.serverLevelData.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.COMMAND); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
2021-06-15 04:59:31 +02:00
|
|
|
@Override
|
2022-12-19 11:46:55 +01:00
|
|
|
@@ -945,8 +945,8 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
2021-06-15 04:59:31 +02:00
|
|
|
this.serverLevelData.setThunderTime(j);
|
|
|
|
this.serverLevelData.setRainTime(k);
|
|
|
|
this.serverLevelData.setClearWeatherTime(i);
|
|
|
|
- this.serverLevelData.setThundering(flag1);
|
|
|
|
- this.serverLevelData.setRaining(flag2);
|
|
|
|
+ this.serverLevelData.setThundering(flag1, org.bukkit.event.weather.ThunderChangeEvent.Cause.NATURAL); // Paper
|
|
|
|
+ this.serverLevelData.setRaining(flag2, org.bukkit.event.weather.WeatherChangeEvent.Cause.NATURAL); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
this.oThunderLevel = this.thunderLevel;
|
2022-12-19 11:46:55 +01:00
|
|
|
@@ -1012,14 +1012,14 @@ public class ServerLevel extends Level implements WorldGenLevel {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-11-24 22:30:53 +01:00
|
|
|
private void resetWeatherCycle() {
|
2021-06-11 14:02:28 +02:00
|
|
|
// CraftBukkit start
|
2021-06-15 04:59:31 +02:00
|
|
|
- this.serverLevelData.setRaining(false);
|
|
|
|
+ this.serverLevelData.setRaining(false, org.bukkit.event.weather.WeatherChangeEvent.Cause.SLEEP); // Paper - when passing the night
|
2021-06-11 14:02:28 +02:00
|
|
|
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
|
|
|
|
// Not that everyone ever manages to get the whole server to sleep at the same time....
|
2021-06-15 04:59:31 +02:00
|
|
|
if (!this.serverLevelData.isRaining()) {
|
|
|
|
this.serverLevelData.setRainTime(0);
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
|
|
|
// CraftBukkit end
|
2021-06-15 04:59:31 +02:00
|
|
|
- this.serverLevelData.setThundering(false);
|
|
|
|
+ this.serverLevelData.setThundering(false, org.bukkit.event.weather.ThunderChangeEvent.Cause.SLEEP); // Paper - when passing the night
|
2021-06-11 14:02:28 +02:00
|
|
|
// CraftBukkit start
|
|
|
|
// If we stop due to everyone sleeping we should reset the weather duration to some other random value.
|
|
|
|
// Not that everyone ever manages to get the whole server to sleep at the same time....
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
|
2022-12-16 02:16:34 +01:00
|
|
|
index 274c8eb1f76fb7cb8a16b438e7e1b14804f3dc51..b6218626bad7f8ddfba91b216ac1e10647f04df5 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/level/storage/PrimaryLevelData.java
|
2022-12-16 02:16:34 +01:00
|
|
|
@@ -359,6 +359,11 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void setThundering(boolean thundering) {
|
|
|
|
+ // Paper start
|
|
|
|
+ this.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.UNKNOWN);
|
|
|
|
+ }
|
2021-11-24 22:30:53 +01:00
|
|
|
+ public void setThundering(boolean thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause cause) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
// CraftBukkit start
|
2021-11-24 22:30:53 +01:00
|
|
|
if (this.thundering == thundering) {
|
2021-06-11 14:02:28 +02:00
|
|
|
return;
|
2022-12-16 02:16:34 +01:00
|
|
|
@@ -366,7 +371,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-06-15 04:59:31 +02:00
|
|
|
org.bukkit.World world = Bukkit.getWorld(this.getLevelName());
|
2021-06-11 14:02:28 +02:00
|
|
|
if (world != null) {
|
|
|
|
- ThunderChangeEvent thunder = new ThunderChangeEvent(world, thundering);
|
2021-11-24 22:30:53 +01:00
|
|
|
+ ThunderChangeEvent thunder = new ThunderChangeEvent(world, thundering, cause); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
Bukkit.getServer().getPluginManager().callEvent(thunder);
|
|
|
|
if (thunder.isCancelled()) {
|
|
|
|
return;
|
2022-12-16 02:16:34 +01:00
|
|
|
@@ -393,6 +398,12 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void setRaining(boolean raining) {
|
|
|
|
+ // Paper start
|
|
|
|
+ this.setRaining(raining, org.bukkit.event.weather.WeatherChangeEvent.Cause.UNKNOWN);
|
|
|
|
+ }
|
|
|
|
+
|
2021-06-15 04:59:31 +02:00
|
|
|
+ public void setRaining(boolean raining, org.bukkit.event.weather.WeatherChangeEvent.Cause cause) {
|
2021-06-11 14:02:28 +02:00
|
|
|
+ // Paper end
|
|
|
|
// CraftBukkit start
|
2021-06-15 04:59:31 +02:00
|
|
|
if (this.raining == raining) {
|
2021-06-11 14:02:28 +02:00
|
|
|
return;
|
2022-12-16 02:16:34 +01:00
|
|
|
@@ -400,7 +411,7 @@ public class PrimaryLevelData implements ServerLevelData, WorldData {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
2021-06-15 04:59:31 +02:00
|
|
|
org.bukkit.World world = Bukkit.getWorld(this.getLevelName());
|
2021-06-11 14:02:28 +02:00
|
|
|
if (world != null) {
|
|
|
|
- WeatherChangeEvent weather = new WeatherChangeEvent(world, raining);
|
2021-06-15 04:59:31 +02:00
|
|
|
+ WeatherChangeEvent weather = new WeatherChangeEvent(world, raining, cause); // Paper
|
2021-06-11 14:02:28 +02:00
|
|
|
Bukkit.getServer().getPluginManager().callEvent(weather);
|
|
|
|
if (weather.isCancelled()) {
|
|
|
|
return;
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2023-03-14 18:11:24 +01:00
|
|
|
index a767f0f8f7cbe24c4cb8deaffa747ff74371a3cd..4c900c17f9080cdb8d910f6dbc8503b0a691df3e 100644
|
2021-06-11 14:02:28 +02:00
|
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
2022-12-07 21:16:54 +01:00
|
|
|
@@ -1183,7 +1183,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void setStorm(boolean hasStorm) {
|
|
|
|
- world.levelData.setRaining(hasStorm);
|
2021-06-15 04:59:31 +02:00
|
|
|
+ world.serverLevelData.setRaining(hasStorm, org.bukkit.event.weather.WeatherChangeEvent.Cause.PLUGIN); // Paper
|
|
|
|
this.setWeatherDuration(0); // Reset weather duration (legacy behaviour)
|
|
|
|
this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|
2022-12-07 21:16:54 +01:00
|
|
|
@@ -1205,7 +1205,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
2021-06-11 14:02:28 +02:00
|
|
|
|
|
|
|
@Override
|
|
|
|
public void setThundering(boolean thundering) {
|
2021-06-15 04:59:31 +02:00
|
|
|
- world.serverLevelData.setThundering(thundering);
|
|
|
|
+ world.serverLevelData.setThundering(thundering, org.bukkit.event.weather.ThunderChangeEvent.Cause.PLUGIN); // Paper
|
|
|
|
this.setThunderDuration(0); // Reset weather duration (legacy behaviour)
|
|
|
|
this.setClearWeatherDuration(0); // Reset clear weather duration (reset "/weather clear" commands)
|
2021-06-11 14:02:28 +02:00
|
|
|
}
|