Latest updates, 1.18 work

This commit is contained in:
Cryptite
2022-03-17 08:10:56 -05:00
parent 5de00a857b
commit 5a042b7890
8 changed files with 53 additions and 21 deletions

View File

@@ -99,10 +99,10 @@ index a80f4dc0a642c744223a155232291ace6e007636..fda1cb8ac3fa78375d90d6bc9f05a78f
}
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
index 850131e601047ab1c585a6f8883ac3c0d0e97ba1..54028d0892e09d521afa628c4c2a8efa4d78d463 100644
index e231636403a70f28e7e4bf51542608872234ce94..47b067f820dbe1d6304e30721afd7a8fd05d2032 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java
@@ -263,7 +263,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
@@ -270,7 +270,7 @@ public abstract class CraftRegionAccessor implements RegionAccessor {
BlockPos pos = new BlockPos(x, y, z);
net.minecraft.world.level.block.state.BlockState old = this.getHandle().getBlockState(pos);
@@ -112,10 +112,10 @@ index 850131e601047ab1c585a6f8883ac3c0d0e97ba1..54028d0892e09d521afa628c4c2a8efa
@Override
diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
index c18edb2c0680a336f11fab30d1d985192dc1393e..f3894c3eb83b67a03a401a1fcebfdc9e95e9e4b7 100644
index a52e76c8870b1dd578c4332930c6f2fd3b31d471..1ed2dcb6f28a391689b5dd10073422bae1dcd8bb 100644
--- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
+++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
@@ -180,15 +180,20 @@ public class CraftBlock implements Block {
@@ -187,15 +187,20 @@ public class CraftBlock implements Block {
@Override
public void setBlockData(BlockData data, boolean applyPhysics) {
@@ -140,7 +140,7 @@ index c18edb2c0680a336f11fab30d1d985192dc1393e..f3894c3eb83b67a03a401a1fcebfdc9e
// SPIGOT-611: need to do this to prevent glitchiness. Easier to handle this here (like /setblock) than to fix weirdness in tile entity cleanup
if (old.hasBlockEntity() && blockData.getBlock() != old.getBlock()) { // SPIGOT-3725 remove old tile entity if block changes
// SPIGOT-4612: faster - just clear tile
@@ -202,7 +207,7 @@ public class CraftBlock implements Block {
@@ -209,7 +214,7 @@ public class CraftBlock implements Block {
if (applyPhysics) {
return world.setBlock(position, blockData, 3);
} else {