From 956609a17cb363b12273f4fd41391a00b5c78326 Mon Sep 17 00:00:00 2001 From: violetc <58360096+s-yh-china@users.noreply.github.com> Date: Sat, 30 Jul 2022 01:17:21 +0800 Subject: [PATCH] Fix tripwire update --- docs/MODIFICATION.md | 1 + docs/MODIFICATION_cn.md | 1 + patches/server/0018-Fix-tripwire-update.patch | 19 +++++++++++++++++++ 3 files changed, 21 insertions(+) create mode 100644 patches/server/0018-Fix-tripwire-update.patch diff --git a/docs/MODIFICATION.md b/docs/MODIFICATION.md index 7ed9e758..fc5134b9 100644 --- a/docs/MODIFICATION.md +++ b/docs/MODIFICATION.md @@ -9,6 +9,7 @@ Leaves Modification - Gravity block duper - Trading with the void +- Tripwire update when it being removed and not disarmed ## Modify diff --git a/docs/MODIFICATION_cn.md b/docs/MODIFICATION_cn.md index f780ef64..40ef6c1a 100644 --- a/docs/MODIFICATION_cn.md +++ b/docs/MODIFICATION_cn.md @@ -9,6 +9,7 @@ Leaves Modification - 重力方块复制 - 虚空交易 +- 绊线钩即将被水破坏时亦然生成激活的绊线 ## 修改 diff --git a/patches/server/0018-Fix-tripwire-update.patch b/patches/server/0018-Fix-tripwire-update.patch new file mode 100644 index 00000000..874d46e1 --- /dev/null +++ b/patches/server/0018-Fix-tripwire-update.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: Sat, 30 Jul 2022 01:11:30 +0800 +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 004dce26ff073f1de52a84cd425c4f60fdab5e50..22d42186973e8f0bf664c5fae261c40af2836173 100644 +--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java ++++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +@@ -147,7 +147,7 @@ public class TripWireHookBlock extends Block { + boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED); + + flag5 |= flag6 && flag7; +- if (k != i || !tripWireBeingRemoved || !flag6) // Paper - don't update the tripwire again if being removed and not disarmed ++ if (k != i || true || !flag6) // Paper - don't update the tripwire again if being removed and not disarmed // Leaves - no! always update it + aiblockdata[k] = iblockdata2; + if (k == i) { + world.scheduleTick(pos, (Block) this, 10);