summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEvilSeph <evilseph@gmail.com>2012-09-14 00:48:38 -0400
committerEvilSeph <evilseph@gmail.com>2012-09-14 01:53:34 -0400
commit349cb0bba61c82e1adc6afc32c1ff8efc375c68a (patch)
treeee085c6d24e3b743fb0d09ad504101f25e547bf2 /src
parent412b4624c30208119cc1152fdd67811fb7a3cbd5 (diff)
downloadcraftbukkit-349cb0bba61c82e1adc6afc32c1ff8efc375c68a.tar
craftbukkit-349cb0bba61c82e1adc6afc32c1ff8efc375c68a.tar.gz
craftbukkit-349cb0bba61c82e1adc6afc32c1ff8efc375c68a.tar.lz
craftbukkit-349cb0bba61c82e1adc6afc32c1ff8efc375c68a.tar.xz
craftbukkit-349cb0bba61c82e1adc6afc32c1ff8efc375c68a.zip
What is dead may never die.
Diffstat (limited to 'src')
-rw-r--r--src/main/java/net/minecraft/server/EntityPlayer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
index 9fe2d0b9..b991bfa7 100644
--- a/src/main/java/net/minecraft/server/EntityPlayer.java
+++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -290,6 +290,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
public void die(DamageSource damagesource) {
// CraftBukkit start
+ if (this.dead) {
+ return;
+ }
+
java.util.List<org.bukkit.inventory.ItemStack> loot = new java.util.ArrayList<org.bukkit.inventory.ItemStack>();
for (int i = 0; i < this.inventory.items.length; ++i) {