PaperMC/nms-patches/WorldData.patch

87 lines
2.7 KiB
Diff
Raw Normal View History

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/WorldData.java
+++ b/net/minecraft/server/WorldData.java
2016-02-29 22:32:46 +01:00
@@ -5,6 +5,11 @@
import java.util.Map;
import java.util.Map.Entry;
2016-05-10 13:47:39 +02:00
import javax.annotation.Nullable;
2015-02-26 23:41:06 +01:00
+// CraftBukkit start
+import org.bukkit.Bukkit;
+import org.bukkit.event.weather.ThunderChangeEvent;
+import org.bukkit.event.weather.WeatherChangeEvent;
2015-02-26 23:41:06 +01:00
+// CraftBukkit end
public class WorldData {
2016-02-29 22:32:46 +01:00
@@ -49,6 +54,7 @@
private int M;
private final Map<DimensionManager, NBTTagCompound> N;
private GameRules O;
2015-02-26 23:41:06 +01:00
+ public WorldServer world; // CraftBukkit
protected WorldData() {
2016-02-29 22:32:46 +01:00
this.f = WorldType.NORMAL;
2016-06-09 03:43:49 +02:00
@@ -437,6 +443,18 @@
}
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;
+ }
+
+ setThunderDuration(0); // Will force a time reset
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
this.v = flag;
}
2016-06-09 03:43:49 +02:00
@@ -453,6 +471,18 @@
}
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;
+ }
+
+ setWeatherDuration(0); // Will force a time reset
+ }
+ // CraftBukkit end
2016-02-29 22:32:46 +01:00
this.t = flag;
}
2016-06-09 03:43:49 +02:00
@@ -598,6 +628,12 @@
2015-02-26 23:41:06 +01:00
public void setDifficulty(EnumDifficulty enumdifficulty) {
2016-02-29 22:32:46 +01:00
this.C = enumdifficulty;
2015-02-26 23:41:06 +01:00
+ // CraftBukkit start
2015-05-05 22:43:47 +02:00
+ PacketPlayOutServerDifficulty packet = new PacketPlayOutServerDifficulty(this.getDifficulty(), this.isDifficultyLocked());
2015-02-26 23:41:06 +01:00
+ for (EntityPlayer player : (java.util.List<EntityPlayer>) (java.util.List) world.players) {
+ player.playerConnection.sendPacket(packet);
+ }
+ // CraftBukkit end
}
2015-05-05 22:43:47 +02:00
public boolean isDifficultyLocked() {
2016-06-09 03:43:49 +02:00
@@ -716,4 +752,12 @@
2016-02-29 22:32:46 +01:00
public void a(DimensionManager dimensionmanager, NBTTagCompound nbttagcompound) {
this.N.put(dimensionmanager, nbttagcompound);
2014-11-29 20:36:57 +01:00
}
+
+ // CraftBukkit start - Check if the name stored in NBT is the correct one
+ public void checkName( String name ) {
2016-02-29 22:32:46 +01:00
+ if ( !this.levelName.equals( name ) ) {
+ this.levelName = name;
+ }
+ }
+ // CraftBukkit end
2014-11-29 20:36:57 +01:00
}