twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-08-15 20:23:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rewrite storm / thunder event handling to catch all cases. Fixes SPIGOT-335.

Browse Source
This commit is contained in:
md_5
2015-01-05 09:50:48 +11:00
parent e5c51c790f
commit 07fcb493a9
3 changed files with 98 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
nms-patches/WorldData.patch
View File

@@ -1,6 +1,50 @@
--- ../work/decompile-8eb82bde//net/minecraft/server/WorldData.java Sat Nov 29 19:36:33 2014
+++ src/main/java/net/minecraft/server/WorldData.java Sat Nov 29 19:35:56 2014
@@ -645,4 +645,12 @@
--- ../work/decompile-8eb82bde/net/minecraft/server/WorldData.java 2015-01-05 09:50:01.989188327 +1100
+++ src/main/java/net/minecraft/server/WorldData.java 2015-01-05 09:50:01.993188321 +1100
@@ -1,6 +1,9 @@
package net.minecraft.server;
import java.util.concurrent.Callable;
+import org.bukkit.Bukkit;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
public class WorldData {
@@ -395,6 +398,16 @@
}
public void setThundering(boolean flag) {
+ // CraftBukkit start
+ org.bukkit.World world = Bukkit.getWorld(getName());
+ if (world != null) {
+ ThunderChangeEvent thunder = new ThunderChangeEvent(world, flag);
+ Bukkit.getServer().getPluginManager().callEvent(thunder);
+ if (thunder.isCancelled()) {
+ return;
+ }
+ }
+ // CraftBukkit end
this.s = flag;
}
@@ -411,6 +424,16 @@
}
public void setStorm(boolean flag) {
+ // CraftBukkit start
+ org.bukkit.World world = Bukkit.getWorld(getName());
+ if (world != null) {
+ WeatherChangeEvent weather = new WeatherChangeEvent(world, flag);
+ Bukkit.getServer().getPluginManager().callEvent(weather);
+ if (weather.isCancelled()) {
+ return;
+ }
+ }
+ // CraftBukkit end
this.q = flag;
}
@@ -645,4 +668,12 @@
static boolean q(WorldData worlddata) {
return worlddata.x;
}