mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-30 20:21:51 +01:00
e4d10a6d67
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: 122289ff Add FaceAttachable interface to handle Grindstone facing in common with Switches a6db750e SPIGOT-5647: ZombieVillager entity should have getVillagerType() CraftBukkit Changes:bbe3d58eSPIGOT-5650: Lectern.setPage(int) causes a NullPointerException3075579fAdd FaceAttachable interface to handle Grindstone facing in common with Switches95bd4238SPIGOT-5647: ZombieVillager entity should have getVillagerType()4d975ac3SPIGOT-5617: setBlockData does not work when NotPlayEvent is called by redstone current
21 lines
999 B
Diff
21 lines
999 B
Diff
From 91f9f9b14d1899439adeb620a72ba6448d24ac0a 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 1b9d889af6..a5e6e94fe0 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);
|
|
--
|
|
2.25.1
|
|
|