Update to Minecraft 1.15.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-01-22 08:00:00 +11:00
parent 09a2fa4d96
commit 77b64e0c78
50 changed files with 293 additions and 421 deletions

View File

@@ -12,15 +12,15 @@
public class WorldData {
@@ -68,6 +73,7 @@
private UUID W;
private final GameRules X;
private final CustomFunctionCallbackTimerQueue<MinecraftServer> Y;
@@ -70,6 +75,7 @@
private boolean Y;
private final GameRules Z;
private final CustomFunctionCallbackTimerQueue<MinecraftServer> aa;
+ public WorldServer world; // CraftBukkit
protected WorldData() {
this.f = WorldType.NORMAL;
@@ -419,6 +425,7 @@
@@ -436,6 +442,7 @@
nbttagcompound.setString("WanderingTraderId", this.W.toString());
}
@@ -28,7 +28,7 @@
}
public long getSeed() {
@@ -511,6 +518,20 @@
@@ -528,6 +535,20 @@
}
public void setThundering(boolean flag) {
@@ -49,7 +49,7 @@
this.thundering = flag;
}
@@ -527,6 +548,20 @@
@@ -544,6 +565,20 @@
}
public void setStorm(boolean flag) {
@@ -70,7 +70,7 @@
this.raining = flag;
}
@@ -676,6 +711,12 @@
@@ -693,6 +728,12 @@
public void setDifficulty(EnumDifficulty enumdifficulty) {
this.F = enumdifficulty;
@@ -83,14 +83,14 @@
}
public boolean isDifficultyLocked() {
@@ -780,4 +821,12 @@
public void a(UUID uuid) {
this.W = uuid;
@@ -808,4 +849,12 @@
this.X.add(s);
this.Y |= flag;
}
+
+ // CraftBukkit start - Check if the name stored in NBT is the correct one
+ public void checkName( String name ) {
+ if ( !this.levelName.equals( name ) ) {
+ public void checkName(String name) {
+ if (!this.levelName.equals(name)) {
+ this.levelName = name;
+ }
+ }