mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-25 16:50:17 +01:00
ffb572ce9a
Spigot has patched this issue inside MapIcon, meaning that we no longer need to maintain this patch; Spigots patch also fixes #668 in that it will verify the length of the array, as well as protect against a negative type value being fetched from the array. Only real change is that Spigots patch returns a MapIcon.Type.PLAYER, instead of the RED_MARKER as originally PR'd by Aikar.
23 lines
1 KiB
Diff
23 lines
1 KiB
Diff
From bbf93cd5704f8d700fcb1154b75085f7406c1a53 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 fcb1a6c6..12fb8163 100644
|
|
--- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
|
|
+++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
|
|
@@ -109,6 +109,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.12.2
|
|
|