Repo-Mirror/Leaf
9
0
Fork 0
mirror of https://github.com/Winds-Studio/Leaf.git synced 2025-12-20 07:29:24 +00:00
Code Issues Releases Activity

Fix Remove Paper's Fix tripwire dupe patch

Browse Source
This commit is contained in:
Dreeam
2023-06-26 12:47:40 +08:00
parent 49fd38fbdb
commit 5a6695a9da
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
patches/server/0013-Remove-Paper-s-Fix-tripwire-state-inconsistency.patch → patches/server/0013-Remove-Paper-s-Fix-tripwire-dupe.patch
View File

@@ -1,8 +1,11 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com>
Date: Sun, 6 Nov 2022 04:32:27 -0500 Date: Sun, 6 Nov 2022 04:32:27 -0500
Subject: [PATCH] Remove Paper's Fix tripwire state inconsistency Subject: [PATCH] Remove Paper's Fix tripwire dupe
Revert Paper's Fix tripwire state inconsistency patches:
Fix-tripwire-state-inconsistency.patch
Validate-tripwire-hook-placement-before-update.patch
diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java diff --git a/src/main/java/net/minecraft/world/level/block/TripWireBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireBlock.java
index 7f60175bf671d282c11e9084670d2bb900968255..4e2fb4ee8e46b3c363992ff23e26f5a648c5f003 100644 index 7f60175bf671d282c11e9084670d2bb900968255..4e2fb4ee8e46b3c363992ff23e26f5a648c5f003 100644
@@ -40,7 +43,7 @@ index 7f60175bf671d282c11e9084670d2bb900968255..4e2fb4ee8e46b3c363992ff23e26f5a6
} else if (iblockdata1.is((Block) this)) { } else if (iblockdata1.is((Block) this)) {
++k; ++k;
diff --git a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java 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..4a516828e5c6abd63511ee7c93fcff11203cf8d0 100644 index 004dce26ff073f1de52a84cd425c4f60fdab5e50..a5f8c7d9d9998eebce7f15e01c157651b9831516 100644
--- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java --- a/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
+++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java +++ b/src/main/java/net/minecraft/world/level/block/TripWireHookBlock.java
@@ -108,12 +108,6 @@ public class TripWireHookBlock extends Block { @@ -108,12 +108,6 @@ public class TripWireHookBlock extends Block {
@@ -64,3 +67,11 @@ index 004dce26ff073f1de52a84cd425c4f60fdab5e50..4a516828e5c6abd63511ee7c93fcff11
aiblockdata[k] = iblockdata2; aiblockdata[k] = iblockdata2;
if (k == i) { if (k == i) {
world.scheduleTick(pos, (Block) this, 10); world.scheduleTick(pos, (Block) this, 10);
@@ -182,7 +175,6 @@ public class TripWireHookBlock extends Block {
this.emitState(world, pos, flag4, flag5, flag2, flag3);
if (!beingRemoved) {
- if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - validate
world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3);
if (flag1) {
this.notifyNeighbors(world, pos, enumdirection);