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/World.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/World.patch')
-rw-r--r-- | nms-patches/World.patch | 62 |
1 files changed, 17 insertions, 45 deletions
diff --git a/nms-patches/World.patch b/nms-patches/World.patch index ddda6510..1c43e866 100644 --- a/nms-patches/World.patch +++ b/nms-patches/World.patch @@ -387,35 +387,7 @@ this.c(entity); } -@@ -1138,6 +1371,13 @@ - - this.methodProfiler.c("blockEntities"); - this.O = true; -+ // CraftBukkit start - From below, clean up tile entities before ticking them -+ if (!this.tileEntityListUnload.isEmpty()) { -+ this.tileEntityListTick.removeAll(this.tileEntityListUnload); -+ this.tileEntityList.removeAll(this.tileEntityListUnload); -+ this.tileEntityListUnload.clear(); -+ } -+ // CraftBukkit end - Iterator iterator = this.tileEntityListTick.iterator(); - - while (iterator.hasNext()) { -@@ -1172,11 +1412,13 @@ - } - - this.O = false; -+ /* CraftBukkit start - Moved up - if (!this.tileEntityListUnload.isEmpty()) { - this.tileEntityListTick.removeAll(this.tileEntityListUnload); - this.tileEntityList.removeAll(this.tileEntityListUnload); - this.tileEntityListUnload.clear(); - } -+ // CraftBukkit end */ - - this.methodProfiler.c("pendingBlockEntities"); - if (!this.b.isEmpty()) { -@@ -1184,9 +1426,11 @@ +@@ -1184,9 +1417,11 @@ TileEntity tileentity1 = (TileEntity) this.b.get(i1); if (!tileentity1.y()) { @@ -427,7 +399,7 @@ if (this.isLoaded(tileentity1.getPosition())) { Chunk chunk = this.getChunkAtWorldCoords(tileentity1.getPosition()); -@@ -1194,6 +1438,12 @@ +@@ -1194,6 +1429,12 @@ chunk.a(tileentity1.getPosition(), tileentity1); this.notify(tileentity1.getPosition(), iblockdata, iblockdata, 3); @@ -440,7 +412,7 @@ } } } -@@ -1247,15 +1497,13 @@ +@@ -1247,15 +1488,13 @@ int i; int j; @@ -462,7 +434,7 @@ entity.M = entity.locX; entity.N = entity.locY; -@@ -1268,6 +1516,7 @@ +@@ -1268,6 +1507,7 @@ entity.aE(); } else { entity.B_(); @@ -470,7 +442,7 @@ } } -@@ -1559,11 +1808,18 @@ +@@ -1559,11 +1799,18 @@ } } @@ -489,7 +461,7 @@ TileEntity tileentity = null; if (this.O) { -@@ -1598,6 +1854,14 @@ +@@ -1598,6 +1845,14 @@ public void setTileEntity(BlockPosition blockposition, @Nullable TileEntity tileentity) { if (!this.E(blockposition)) { if (tileentity != null && !tileentity.y()) { @@ -504,7 +476,7 @@ if (this.O) { tileentity.setPosition(blockposition); Iterator iterator = this.b.iterator(); -@@ -1757,6 +2021,14 @@ +@@ -1757,6 +2012,14 @@ } this.o = MathHelper.a(this.o, 0.0F, 1.0F); @@ -519,7 +491,7 @@ } } } -@@ -1894,7 +2166,10 @@ +@@ -1894,7 +2157,10 @@ } public boolean c(EnumSkyBlock enumskyblock, BlockPosition blockposition) { @@ -531,7 +503,7 @@ return false; } else { int i = 0; -@@ -2061,7 +2336,7 @@ +@@ -2061,7 +2327,7 @@ while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); @@ -540,7 +512,7 @@ arraylist.add(entity); } } -@@ -2076,7 +2351,7 @@ +@@ -2076,7 +2342,7 @@ while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); @@ -549,7 +521,7 @@ arraylist.add(entity); } } -@@ -2125,7 +2400,7 @@ +@@ -2125,7 +2391,7 @@ } } @@ -558,7 +530,7 @@ } @Nullable -@@ -2146,8 +2421,17 @@ +@@ -2146,8 +2412,17 @@ while (iterator.hasNext()) { Entity entity = (Entity) iterator.next(); @@ -577,7 +549,7 @@ ++i; } } -@@ -2156,12 +2440,18 @@ +@@ -2156,12 +2431,18 @@ } public void a(Collection<Entity> collection) { @@ -597,7 +569,7 @@ this.b(entity); } -@@ -2175,7 +2465,13 @@ +@@ -2175,7 +2456,13 @@ IBlockData iblockdata = this.getType(blockposition); AxisAlignedBB axisalignedbb = flag ? null : block.getBlockData().d(this, blockposition); @@ -612,7 +584,7 @@ } public int getSeaLevel() { -@@ -2285,6 +2581,11 @@ +@@ -2285,6 +2572,11 @@ for (int i = 0; i < this.players.size(); ++i) { EntityHuman entityhuman1 = (EntityHuman) this.players.get(i); @@ -624,7 +596,7 @@ if (predicate.apply(entityhuman1)) { double d5 = entityhuman1.d(d0, d1, d2); -@@ -2453,6 +2754,16 @@ +@@ -2453,6 +2745,16 @@ public void everyoneSleeping() {} @@ -641,7 +613,7 @@ public float h(float f) { return (this.p + (this.q - this.p) * f) * this.j(f); } -@@ -2670,7 +2981,7 @@ +@@ -2670,7 +2972,7 @@ int l = j * 16 + 8 - blockposition.getZ(); boolean flag = true; |