mirror of
https://github.com/LeavesMC/Leaves.git
synced 2025-12-19 14:59:32 +00:00
d5c9306a7f
* init 1.21.4, and boom! * build change, but weight not work * just work * Build changes, and delete timings * Fix API patches (#406) * Fix API patches * merge --------- Co-authored-by: violetc <58360096+s-yh-china@users.noreply.github.com> * 0006/0129 * 0009/0129 * 0011/0129 * 0018/0129 * 0030/0129 * 0035/0129 * 0043/0129 * 0048/0129 * 0049/0129 * 0057/0129 * 0065/0129 * 0086/0129 (#408) * 0072/0129 * 0080/0129 * Readd patch infos * 0086/0129 * Delete applied patches * 0087/0129 * 0091/0129 * 0097/0129 * 0101/0129 * 102/129 * 0107/0129 * 0112/0129 * 0118/0129 * 0129/0129, 100% patched * fix some * server work * Protocol... (#409) * Jade v7 * Fix changed part for Jade * Formatting imports, add Lms Paster protocol * REI payloads 5/8 * Add REI support, remove unnecessary content in Jade * Rename * Make jade better * Make action work * fix action jar * Fix some protocol * Fix bot action, and entity tickCount * Fix Warden GameEventListener register on load * Fix extra Raider drop * Fix grindstone overstacking * Update Paper, and some doc * Merge * [ci skip] Update Action --------- Co-authored-by: Lumine1909 <133463833+Lumine1909@users.noreply.github.com>
40 lines
2.6 KiB
Diff
40 lines
2.6 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/net/minecraft/world/level/block/TripWireHookBlock.java b/net/minecraft/world/level/block/TripWireHookBlock.java
|
|
index 30b97cdcd495490ef65c2ab9dfc39a39c93002ca..15454e9b3289a722c8d7e33ce421a544d03966fa 100644
|
|
--- a/net/minecraft/world/level/block/TripWireHookBlock.java
|
|
+++ b/net/minecraft/world/level/block/TripWireHookBlock.java
|
|
@@ -201,7 +201,6 @@ public class TripWireHookBlock extends Block {
|
|
if (!cancelledEmitterHook) { // Paper - Call BlockRedstoneEvent
|
|
emitState(level, pos, flag2, flag3, flag, flag1);
|
|
if (!attaching) {
|
|
- if (io.papermc.paper.configuration.GlobalConfiguration.get().unsupportedSettings.skipTripwireHookPlacementValidation || level.getBlockState(pos).is(Blocks.TRIPWIRE_HOOK)) // Paper - Validate tripwire hook placement before update
|
|
level.setBlock(pos, blockState1.setValue(FACING, direction), 3);
|
|
if (shouldNotifyNeighbours) {
|
|
notifyNeighbors(block, level, pos, direction);
|
|
@@ -214,10 +213,17 @@ public class TripWireHookBlock extends Block {
|
|
BlockPos blockPos1 = pos.relative(direction, i2);
|
|
BlockState blockState2 = blockStates[i2];
|
|
if (blockState2 != null) {
|
|
- BlockState blockState3 = level.getBlockState(blockPos1);
|
|
- if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
|
|
- level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3);
|
|
+ // Leaves start - MC-59471
|
|
+ if (org.leavesmc.leaves.LeavesConfig.modify.oldMC.stringTripwireHookDuplicate) {
|
|
+ level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, flag2), 3);
|
|
+ level.getBlockState(blockPos1);
|
|
+ } else {
|
|
+ BlockState blockState3 = level.getBlockState(blockPos1);
|
|
+ if (blockState3.is(Blocks.TRIPWIRE) || blockState3.is(Blocks.TRIPWIRE_HOOK)) {
|
|
+ level.setBlock(blockPos1, blockState2.trySetValue(ATTACHED, Boolean.valueOf(flag2)), 3);
|
|
+ }
|
|
}
|
|
+ // Leaves end - MC-59471
|
|
}
|
|
}
|
|
}
|