Archiviert
13
0
Dieses Repository wurde am 2024-12-25 archiviert. Du kannst Dateien ansehen und es klonen, aber nicht pushen oder Issues/Pull-Requests öffnen.
Paper-Old/patches/server/0602-Add-cause-to-Weather-ThunderChangeEvents.patch

119 Zeilen
6.7 KiB
Diff

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-09-22 14:33:54 +02:00
index b6e2e23d773ca3b9f35c7905bbc0f7681cb4a309..c16d0e4f30e7b3c6d2c0b320353646589a84c6c8 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
2023-09-22 07:41:27 +02:00
@@ -437,8 +437,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
2023-09-22 07:41:27 +02:00
@@ -855,8 +855,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;
2023-09-22 07:41:27 +02:00
@@ -922,14 +922,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
2023-09-22 07:41:27 +02:00
index 14b8011c8874e05647eb1636ee1eed5d90da8200..7bfc5bbfcf67e5bbf57e99e648ff5bed4d6b477f 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
2023-06-08 03:13:54 +02:00
@@ -394,6 +394,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;
2023-06-08 03:13:54 +02:00
@@ -401,7 +406,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;
2023-06-08 03:13:54 +02:00
@@ -428,6 +433,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;
2023-06-08 03:13:54 +02:00
@@ -435,7 +446,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-09-22 07:41:27 +02:00
index 202ebd562ec1e2b3f1087424da60cadca5da7d01..47a880bfabcd950ff985c2763531c68db80347f2 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
2023-09-22 07:41:27 +02:00
@@ -1191,7 +1191,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
}
2023-09-22 07:41:27 +02:00
@@ -1213,7 +1213,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
}