summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorErik Broes <erikbroes@grum.nl>2012-01-29 13:37:32 +0100
committerErik Broes <erikbroes@grum.nl>2012-01-29 13:37:32 +0100
commit3173b68bbe223ba483e77e53787d98bbb380a475 (patch)
tree93f53f7b9d2bc487da6416c55dd9bd85e6004384 /src
parent4c2f57592d73b51d7e78b259dce843edd48b562b (diff)
downloadcraftbukkit-3173b68bbe223ba483e77e53787d98bbb380a475.tar
craftbukkit-3173b68bbe223ba483e77e53787d98bbb380a475.tar.gz
craftbukkit-3173b68bbe223ba483e77e53787d98bbb380a475.tar.lz
craftbukkit-3173b68bbe223ba483e77e53787d98bbb380a475.tar.xz
craftbukkit-3173b68bbe223ba483e77e53787d98bbb380a475.zip
Filter null/AIR from items dropped on death. Fixes: BUKKIT-653
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
index db45fb60..f1e30074 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -377,6 +377,8 @@ public class CraftEventFactory {
victim.newExp = event.getNewExp();
for (org.bukkit.inventory.ItemStack stack : event.getDrops()) {
+ if (stack == null || stack.getType() == Material.AIR) continue;
+
world.dropItemNaturally(entity.getLocation(), stack);
}