mirror of
https://github.com/PaperMC/Paper.git
synced 2024-10-30 07:19:58 +01:00
459987d69f
improved the water code so that immunity wont trigger if the entity has the water pathfinder system active, so this improves support for all entities that know how to behave in water. Merged 2 EAR patches together, and removed an MCUtil method that doesnt have a purpose anymore
24 lines
1.1 KiB
Diff
24 lines
1.1 KiB
Diff
From e618f0e07ba700822b5535b70b756e9b1c37664a Mon Sep 17 00:00:00 2001
|
|
From: Aikar <aikar@aikar.co>
|
|
Date: Mon, 2 Jan 2017 16:32:56 -0500
|
|
Subject: [PATCH] ShulkerBox Dupe Prevention
|
|
|
|
This ensures that Shulker Boxes can never drop their contents twice, and
|
|
that the inventory is cleared incase it some how also got saved to the world.
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
|
|
index 82b4d82c0e..d00bd9d610 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
|
|
@@ -100,6 +100,7 @@ public class BlockShulkerBox extends BlockTileEntity {
|
|
}
|
|
|
|
a(world, blockposition, itemstack);
|
|
+ tileentityshulkerbox.clear(); // Paper - This was intended to be called in Vanilla (is checked in the if statement above if has been called) - Fixes dupe issues
|
|
}
|
|
}
|
|
world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
|
|
--
|
|
2.19.0
|
|
|