SteamWar/Paper
13
0
Fork 0
geforkt von Mirrors/Paper
Code Issues Pull-Requests 1 Aktivität

Validate tripwire hook placement before update

Quellcode durchsuchen
Dieser Commit ist enthalten in:
Shane Freeder 2020-03-07 00:07:51 +00:00
Ursprung 4bff4be120
Commit 26067ca04b
1 geänderte Dateien mit 10 neuen und 5 gelöschten Zeilen
Statistiken anzeigen Patch-Datei herunterladen Vergleichs-Datei herunterladen Alle Dateien ausklappen Alle Dateien einklappen

15
paper-server/patches/sources/net/minecraft/world/level/block/TripWireHookBlock.java.patch
Datei anzeigen

@ -11,19 +11,24 @@
public class TripWireHookBlock extends Block { public class TripWireHookBlock extends Block {
@@ -176,6 +180,15 @@ @@ -174,10 +178,20 @@
world.setBlock(blockposition1, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection1), 3);
TripWireHookBlock.notifyNeighbors(block, world, blockposition1, enumdirection1);
TripWireHookBlock.emitState(world, blockposition1, flag4, flag5, flag2, flag3); TripWireHookBlock.emitState(world, blockposition1, flag4, flag5, flag2, flag3);
} + }
+
+ // CraftBukkit start + // CraftBukkit start
+ BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(CraftBlock.at(world, pos), 15, 0); + BlockRedstoneEvent eventRedstone = new BlockRedstoneEvent(CraftBlock.at(world, pos), 15, 0);
+ world.getCraftServer().getPluginManager().callEvent(eventRedstone); + world.getCraftServer().getPluginManager().callEvent(eventRedstone);
+ +
+ if (eventRedstone.getNewCurrent() > 0) { + if (eventRedstone.getNewCurrent() > 0) {
+ return; + return;
+ } }
+ // CraftBukkit end + // CraftBukkit end
+
TripWireHookBlock.emitState(world, pos, flag4, flag5, flag2, flag3); TripWireHookBlock.emitState(world, pos, flag4, flag5, flag2, flag3);
if (!flag) { if (!flag) {
+ if (world.getBlockState(pos).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - Validate tripwire hook placement before update
world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3); world.setBlock(pos, (BlockState) iblockdata3.setValue(TripWireHookBlock.FACING, enumdirection), 3);
if (flag1) {
TripWireHookBlock.notifyNeighbors(block, world, pos, enumdirection);