diff --git a/patches/server/0017-Fix-tripwire-update.patch b/patches/server/0017-Fix-tripwire-update.patch index 4e27e63b..7e6fac4d 100644 --- a/patches/server/0017-Fix-tripwire-update.patch +++ b/patches/server/0017-Fix-tripwire-update.patch @@ -5,9 +5,18 @@ Subject: [PATCH] Fix tripwire update diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java -index 76aca266d3f3222502ff4c196228f08fcd88c5f8..8614fad5b3df7a6030384b108b1689bf6b9f1209 100644 +index 76aca266d3f3222502ff4c196228f08fcd88c5f8..6b921c459e24c509b3962837b4c966d012940c08 100644 --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +@@ -189,7 +189,7 @@ public class TripWireHookBlock extends Block { + + TripWireHookBlock.emitState(world, pos, flag4, flag5, flag2, flag3); + if (!flag) { +- if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - Validate tripwire hook placement before update ++ // if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - Validate tripwire hook placement before update // Leaves - vanilla lol + world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3); + if (flag1) { + TripWireHookBlock.notifyNeighbors(block, world, pos, enumdirection); @@ -202,8 +202,9 @@ public class TripWireHookBlock extends Block { BlockState iblockdata4 = aiblockdata[l]; diff --git a/patches/server/0132-Fix-FallingBlockEntity-Duplicate.patch b/patches/server/0132-Fix-FallingBlockEntity-Duplicate.patch new file mode 100644 index 00000000..6ff96f4f --- /dev/null +++ b/patches/server/0132-Fix-FallingBlockEntity-Duplicate.patch @@ -0,0 +1,19 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: violetc <58360096+s-yh-china@users.noreply.github.com> +Date: Wed, 31 Jul 2024 12:51:44 +0800 +Subject: [PATCH] Fix FallingBlockEntity Duplicate + + +diff --git a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +index b83be9bbb9f348da83c0fd1ecc7f65c8a58b45b9..e38f588e3043320a9c135e03f506a00924ed58b8 100644 +--- a/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java ++++ b/src/main/java/net/minecraft/world/entity/item/FallingBlockEntity.java +@@ -419,7 +419,7 @@ public class FallingBlockEntity extends Entity { + boolean flag = (resourcekey1 == Level.END || resourcekey == Level.END) && resourcekey1 != resourcekey; + Entity entity = super.changeDimension(teleportTarget); + +- this.forceTickAfterTeleportToDuplicate = entity != null && flag && io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.allowUnsafeEndPortalTeleportation; // Paper ++ this.forceTickAfterTeleportToDuplicate = entity != null && flag; // Paper // Leaves + return entity; + } + }