From 349cb0bba61c82e1adc6afc32c1ff8efc375c68a Mon Sep 17 00:00:00 2001
From: EvilSeph <evilseph@gmail.com>
Date: Fri, 14 Sep 2012 00:48:38 -0400
Subject: What is dead may never die.

---
 src/main/java/net/minecraft/server/EntityPlayer.java | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/main/java')

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) {
-- 
cgit v1.2.3