Massive renaming update in nms. If you bypassed Bukkit, you will likely break.

Also minimized all the nms diffs and generic cleanups all around.

src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java

@@ -40,7 +40,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
         }
 
         if (entity instanceof EntityPlayer && health == 0) {
-            ((EntityPlayer) entity).a((Entity) null);
+            ((EntityPlayer) entity).die((Entity) null);
         }
 
         getHandle().health = health;