mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-27 04:55:47 +01:00
36f34f01c0
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: da9ef3c5 #496: Add methods to get/set ItemStacks in EquipmentSlots 3abebc9f #492: Let Tameable extend Animals rather than Entity 941111a0 #495: Expose ItemStack and hand used in PlayerShearEntityEvent 4fe19cae #494: InventoryView - Add missing Brewing FUEL_TIME CraftBukkit Changes:933e9094#664: Add methods to get/set ItemStacks in EquipmentSlots18722312#662: Expose ItemStack and hand used in PlayerShearEntityEvent
19 lines
1.0 KiB
Diff
19 lines
1.0 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Sat, 7 Mar 2020 00:07:51 +0000
|
|
Subject: [PATCH] Validate tripwire hook placement before update
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockTripwireHook.java b/src/main/java/net/minecraft/server/BlockTripwireHook.java
|
|
index 1b9d889af6bdefed0d6a3ebc832c39effb8af0b9..a5e6e94fe0d7702594a842bcfec2fcaae9f19d7f 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockTripwireHook.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockTripwireHook.java
|
|
@@ -149,6 +149,7 @@ public class BlockTripwireHook extends Block {
|
|
|
|
this.a(world, blockposition, flag4, flag5, flag2, flag3);
|
|
if (!flag) {
|
|
+ if (world.getType(blockposition).getBlock() == Blocks.TRIPWIRE_HOOK) // Paper - validate
|
|
world.setTypeAndData(blockposition, (IBlockData) iblockdata3.set(BlockTripwireHook.FACING, enumdirection), 3);
|
|
if (flag1) {
|
|
this.a(world, blockposition, enumdirection);
|