summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-11-28 12:34:21 +1100
committermd_5 <git@md-5.net>2016-11-28 12:34:21 +1100
commit2ba48b4965389ded9f4883bcb1da021710f0feb7 (patch)
tree0481ed643e807508eb1feb1e21c54af619aae76f
parentc91ca4a54125b568fbc2f6b792cd68350d5e98da (diff)
downloadcraftbukkit-2ba48b4965389ded9f4883bcb1da021710f0feb7.tar
craftbukkit-2ba48b4965389ded9f4883bcb1da021710f0feb7.tar.gz
craftbukkit-2ba48b4965389ded9f4883bcb1da021710f0feb7.tar.lz
craftbukkit-2ba48b4965389ded9f4883bcb1da021710f0feb7.tar.xz
craftbukkit-2ba48b4965389ded9f4883bcb1da021710f0feb7.zip
SPIGOT-2855: Empty ItemStacks in PlayerDeathEvent drops
-rw-r--r--nms-patches/EntityPlayer.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/nms-patches/EntityPlayer.patch b/nms-patches/EntityPlayer.patch
index 0ec9bbfa..992541a6 100644
--- a/nms-patches/EntityPlayer.patch
+++ b/nms-patches/EntityPlayer.patch
@@ -182,7 +182,7 @@
+
+ if (!keepInventory) {
+ for (ItemStack item : this.inventory.getContents()) {
-+ if (!EnchantmentManager.c(item)) { // PAIL: shouldNotDrop (Vanishing enchant)
++ if (!item.isEmpty() && !EnchantmentManager.c(item)) { // PAIL: shouldNotDrop (Vanishing enchant)
+ loot.add(CraftItemStack.asCraftMirror(item));
+ }
+ }