mirrors/papermc
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix compile

Browse source
This commit is contained in:
Nassim Jahnke 2022-01-03 10:23:56 +01:00
parent 00d6cca4df
commit 5e30e19e20
No known key found for this signature in database
GPG key ID: 6BE3B555EBC5982B
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
patches/server/0826-Fix-tripwire-state-inconsistency.patch
View file

@ -41,7 +41,7 @@ index 6b40bf94fbaa18605b59b92ad1582e8dc3a6a9cd..7d89b9ed84209c161b2c6fec5304abbb
} 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 02a3e1ced592784b9c66927c76376c7ab413367d..277463eb0456ced1fe015d27b10505ec9e2a21ab 100644 index 02a3e1ced592784b9c66927c76376c7ab413367d..a4344bf2267112e3c1e31c07c9f6b8eae9666947 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
@@ -107,6 +107,12 @@ public class TripWireHookBlock extends Block { @@ -107,6 +107,12 @@ public class TripWireHookBlock extends Block {
@ -61,7 +61,7 @@ index 02a3e1ced592784b9c66927c76376c7ab413367d..277463eb0456ced1fe015d27b10505ec
boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED); boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
flag5 |= flag6 && flag7; flag5 |= flag6 && flag7;
+ if (k != i || !tripWireBeingRemoved || !flag6)) // Paper - don't update the tripwire again if being removed and not disarmed + if (k != i || !tripWireBeingRemoved || !flag6) // Paper - don't update the tripwire again if being removed and not disarmed
aiblockdata[k] = iblockdata2; aiblockdata[k] = iblockdata2;
if (k == i) { if (k == i) {
world.scheduleTick(pos, (Block) this, 10); world.scheduleTick(pos, (Block) this, 10);