Update to Minecraft 1.14.3-pre4

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-06-21 20:00:00 +10:00
parent 0297d9de8a
commit a8155d2399
109 changed files with 660 additions and 622 deletions

View File

@@ -12,23 +12,23 @@
public class WorldData {
@@ -68,6 +73,7 @@
private UUID X;
private final GameRules Y;
private final CustomFunctionCallbackTimerQueue<MinecraftServer> Z;
@@ -67,6 +72,7 @@
private UUID W;
private final GameRules X;
private final CustomFunctionCallbackTimerQueue<MinecraftServer> Y;
+ public WorldServer world; // CraftBukkit
protected WorldData() {
this.f = WorldType.NORMAL;
@@ -419,6 +425,7 @@
nbttagcompound.setString("WanderingTraderId", this.X.toString());
@@ -418,6 +424,7 @@
nbttagcompound.setString("WanderingTraderId", this.W.toString());
}
+ nbttagcompound.setString("Bukkit.Version", Bukkit.getName() + "/" + Bukkit.getVersion() + "/" + Bukkit.getBukkitVersion()); // CraftBukkit
}
public long getSeed() {
@@ -508,6 +515,20 @@
@@ -506,6 +513,20 @@
}
public void setThundering(boolean flag) {
@@ -49,7 +49,7 @@
this.thundering = flag;
}
@@ -524,6 +545,20 @@
@@ -522,6 +543,20 @@
}
public void setStorm(boolean flag) {
@@ -70,10 +70,10 @@
this.raining = flag;
}
@@ -673,6 +708,12 @@
@@ -671,6 +706,12 @@
public void setDifficulty(EnumDifficulty enumdifficulty) {
this.G = enumdifficulty;
this.F = enumdifficulty;
+ // CraftBukkit start
+ PacketPlayOutServerDifficulty packet = new PacketPlayOutServerDifficulty(this.getDifficulty(), this.isDifficultyLocked());
+ for (EntityPlayer player : (java.util.List<EntityPlayer>) (java.util.List) world.getPlayers()) {
@@ -83,9 +83,9 @@
}
public boolean isDifficultyLocked() {
@@ -777,4 +818,12 @@
@@ -775,4 +816,12 @@
public void a(UUID uuid) {
this.X = uuid;
this.W = uuid;
}
+
+ // CraftBukkit start - Check if the name stored in NBT is the correct one