Update to Minecraft 1.12.2

By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2017-09-18 20:00:00 +10:00
parent 65ab757f26
commit 5e3ba4ff73
23 changed files with 120 additions and 148 deletions

View File

@@ -1,6 +1,6 @@
--- a/net/minecraft/server/WorldServer.java
+++ b/net/minecraft/server/WorldServer.java
@@ -19,14 +19,26 @@
@@ -20,14 +20,26 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -29,7 +29,7 @@
private final Map<UUID, Entity> entitiesByUUID = Maps.newHashMap();
public boolean savingDisabled;
private boolean Q;
@@ -38,14 +50,22 @@
@@ -39,14 +51,22 @@
private int V;
private final List<NextTickListEntry> W = Lists.newArrayList();
@@ -55,7 +55,7 @@
this.J();
this.K();
this.getWorldBorder().a(minecraftserver.aE());
@@ -64,6 +84,7 @@
@@ -65,6 +85,7 @@
this.villages.a((World) this);
}
@@ -63,7 +63,7 @@
this.scoreboard = new ScoreboardServer(this.server);
PersistentScoreboard persistentscoreboard = (PersistentScoreboard) this.worldMaps.get(PersistentScoreboard.class, "scoreboard");
@@ -74,9 +95,21 @@
@@ -75,9 +96,21 @@
persistentscoreboard.a(this.scoreboard);
((ScoreboardServer) this.scoreboard).a((Runnable) (new RunnableSaveScoreboard(persistentscoreboard)));
@@ -87,7 +87,7 @@
this.getWorldBorder().setCenter(this.worldData.B(), this.worldData.C());
this.getWorldBorder().setDamageAmount(this.worldData.H());
this.getWorldBorder().setDamageBuffer(this.worldData.G());
@@ -88,9 +121,146 @@
@@ -89,9 +122,146 @@
this.getWorldBorder().setSize(this.worldData.D());
}
@@ -234,7 +234,7 @@
public void doTick() {
super.doTick();
if (this.getWorldData().isHardcore() && this.getDifficulty() != EnumDifficulty.HARD) {
@@ -109,8 +279,11 @@
@@ -110,8 +280,11 @@
}
this.methodProfiler.a("mobSpawner");
@@ -248,7 +248,7 @@
}
this.methodProfiler.c("chunkSource");
@@ -139,6 +312,8 @@
@@ -140,6 +313,8 @@
this.portalTravelAgent.a(this.getTime());
this.methodProfiler.b();
this.aq();
@@ -257,7 +257,7 @@
}
@Nullable
@@ -166,7 +341,7 @@
@@ -167,7 +342,7 @@
if (entityhuman.isSpectator()) {
++i;