diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index 1d249e3a1d..2fd7bd4a8a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2088,7 +2088,7 @@ public class World implements IBlockAccess {
         for (int i = 0; i < this.players.size(); ++i) {
             EntityHuman entityhuman1 = (EntityHuman) this.players.get(i);
             // CraftBukkit start - fixed an NPE
-            if (entityhuman1 == null) {
+            if (entityhuman1 == null || entityhuman1.dead) {
                 continue;
             }
             // CraftBukkit end