diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index ea939f8661..59531c1643 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -2565,6 +2565,9 @@ public class World implements IBlockAccess {
         for (int i = 0; i < this.players.size(); ++i) {
             EntityHuman entityhuman1 = (EntityHuman) this.players.get(i);
 
+            // CraftBukkit - fixed NPE
+            if (entityhuman1 == null || entityhuman1.dead) continue;
+
             if (!entityhuman1.abilities.isInvulnerable) {
                 double d5 = entityhuman1.e(d0, d1, d2);