diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index bc1c293feb..8e736c2c67 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -6,6 +6,7 @@ import net.minecraft.server.EntityArrow;
 import net.minecraft.server.EntityEgg;
 import net.minecraft.server.EntityLiving;
 import net.minecraft.server.EntitySnowball;
+import net.minecraft.server.EntityPlayer;
 
 import org.bukkit.Location;
 import org.bukkit.craftbukkit.CraftServer;
@@ -38,6 +39,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
             throw new IllegalArgumentException("Health must be between 0 and 200");
         }
 
+        if (entity instanceof EntityPlayer && health == 0) {
+            ((EntityPlayer)entity).a((Entity)null);
+        }
+
         getHandle().health = health;
     }