mirror of
https://github.com/PaperMC/Paper.git
synced 2024-06-25 06:14:50 +02:00
e792da723a
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: 30885166 Update to Minecraft 1.16.4 CraftBukkit Changes: 3af81c71 Update to Minecraft 1.16.4 Spigot Changes: f011ca24 Update to Minecraft 1.16.4 Co-authored-by: Mariell Hoversholm <proximyst@proximyst.com>
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 26d801c231c6e9e31d0bdfea59e6027c77f488e4..dd30810569325096d35a367c4348e09f1463b2a9 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);
|