diff options
| author | md_5 <git@md-5.net> | 2018-10-23 06:00:00 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2018-10-23 06:00:00 +1100 |
| commit | b4230a9a7efde35b30fefdb4a2492209d5334def (patch) | |
| tree | 62e6e1933ed69e46e56a559e2a723d5a91f18244 /nms-patches/World.patch | |
| parent | a639ae44d24fd7ce48c9390c27dd70cc5fd9d38b (diff) | |
| download | craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar.gz craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar.lz craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.tar.xz craftbukkit-b4230a9a7efde35b30fefdb4a2492209d5334def.zip | |
Update to Minecraft 1.13.2
Diffstat (limited to 'nms-patches/World.patch')
| -rw-r--r-- | nms-patches/World.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nms-patches/World.patch b/nms-patches/World.patch index 10d0c321..d017d986 100644 --- a/nms-patches/World.patch +++ b/nms-patches/World.patch @@ -146,7 +146,7 @@ } else { Chunk chunk = this.getChunkAtWorldCoords(blockposition); Block block = iblockdata.getBlock(); -- IBlockData iblockdata1 = chunk.a(blockposition, iblockdata, (i & 64) != 0); +- IBlockData iblockdata1 = chunk.setType(blockposition, iblockdata, (i & 64) != 0); + + // CraftBukkit start - capture blockstates + CraftBlockState blockstate = null; @@ -156,7 +156,7 @@ + } + // CraftBukkit end + -+ IBlockData iblockdata1 = chunk.a(blockposition, iblockdata, (i & 64) != 0, (i & 1024) == 0); // CraftBukkit custom NO_PLACE flag ++ IBlockData iblockdata1 = chunk.setType(blockposition, iblockdata, (i & 64) != 0, (i & 1024) == 0); // CraftBukkit custom NO_PLACE flag if (iblockdata1 == null) { + // CraftBukkit start - remove blockstate if failed @@ -335,7 +335,7 @@ + if (vehicle != null) { + vehicle.dead = true; + } -+ for (Entity passenger : entity.bQ()) { ++ for (Entity passenger : entity.getAllPassengers()) { + passenger.dead = true; + } + entity.dead = true; @@ -595,7 +595,7 @@ if (predicate.test(entityhuman1)) { double d5 = entityhuman1.d(d0, d1, d2); -@@ -2164,6 +2475,16 @@ +@@ -2185,6 +2496,16 @@ public void everyoneSleeping() {} @@ -612,7 +612,7 @@ public float g(float f) { return (this.q + (this.r - this.q) * f) * this.i(f); } -@@ -2325,7 +2646,7 @@ +@@ -2346,7 +2667,7 @@ int l = j * 16 + 8 - blockposition.getZ(); boolean flag = true; |