diff options
author | md_5 <git@md-5.net> | 2017-09-18 20:00:00 +1000 |
---|---|---|
committer | md_5 <git@md-5.net> | 2017-09-18 20:00:00 +1000 |
commit | 9a1f5ee80a8665b0c388758003e2bda1ee924084 (patch) | |
tree | b97318e90572fbf8190689d2233eac672d888f70 /nms-patches/WorldServer.patch | |
parent | 8f472147b7f78ccd565bc97a125030f92fdf732d (diff) | |
download | craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar.gz craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar.lz craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.tar.xz craftbukkit-9a1f5ee80a8665b0c388758003e2bda1ee924084.zip |
Update to Minecraft 1.12.2
Diffstat (limited to 'nms-patches/WorldServer.patch')
-rw-r--r-- | nms-patches/WorldServer.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/nms-patches/WorldServer.patch b/nms-patches/WorldServer.patch index 57a5ae85..b5178ece 100644 --- a/nms-patches/WorldServer.patch +++ b/nms-patches/WorldServer.patch @@ -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; |