mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-28 23:38:25 +01:00
parent
30e83fff8a
commit
13786438fc
2 changed files with 2 additions and 2 deletions
|
@ -2073,7 +2073,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
continue; // The line contents are still the same, skip.
|
continue; // The line contents are still the same, skip.
|
||||||
}
|
}
|
||||||
- sign.setMessage(i, CraftChatMessage.fromString(line)[0]);
|
- sign.setMessage(i, CraftChatMessage.fromString(line)[0]);
|
||||||
+ sign.messages[i] = io.papermc.paper.adventure.PaperAdventure.asVanilla(component);
|
+ sign.setMessage(i, io.papermc.paper.adventure.PaperAdventure.asVanilla(component));
|
||||||
}
|
}
|
||||||
+ // Paper end
|
+ // Paper end
|
||||||
}
|
}
|
||||||
|
|
|
@ -61,7 +61,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
||||||
boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
|
boolean flag7 = (Boolean) iblockdata2.getValue(TripWireBlock.POWERED);
|
||||||
|
|
||||||
flag5 |= flag6 && flag7;
|
flag5 |= flag6 && flag7;
|
||||||
+ if (!tripWireBeingRemoved || (k == i && !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);
|
||||||
|
|
Loading…
Reference in a new issue