mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-30 12:29:18 +00:00
43 lines
2.7 KiB
Diff
43 lines
2.7 KiB
Diff
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] Configurable MC-59471
|
|
|
|
|
|
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 c2589f42c467ca672417c24076313da51bb2dcbb..99caf34456385565d8a985409690c656ab3d3c3d 100644
|
|
--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
|
|
+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
|
|
@@ -191,7 +191,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);
|
|
@@ -204,11 +204,18 @@ public class TripWireHookBlock extends Block {
|
|
BlockState iblockdata4 = aiblockdata[l];
|
|
|
|
if (iblockdata4 != null) {
|
|
- BlockState iblockdata5 = world.getBlockState(blockposition2);
|
|
-
|
|
- if (iblockdata5.is(Blocks.TRIPWIRE) || iblockdata5.is(Blocks.TRIPWIRE_HOOK)) {
|
|
- world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
|
|
+ // Leaves start - MC-59471
|
|
+ if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.stringTripwireHookDuplicate) {
|
|
+ world.setBlock(blockposition2, iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
|
|
+ world.getBlockState(blockposition2);
|
|
+ } else {
|
|
+ BlockState iblockdata5 = world.getBlockState(blockposition2);
|
|
+
|
|
+ if (iblockdata5.is(Blocks.TRIPWIRE) || iblockdata5.is(Blocks.TRIPWIRE_HOOK)) {
|
|
+ world.setBlock(blockposition2, (BlockState) iblockdata4.trySetValue(TripWireHookBlock.ATTACHED, flag4), 3);
|
|
+ }
|
|
}
|
|
+ // Leaves end - MC-59471
|
|
}
|
|
}
|
|
}
|