diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
index 0d50c1bd..ef1a2796 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_10/BukkitQueue_1_10.java
@@ -406,11 +406,11 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<net.minecraft.server.v1_10_R
         try {
             PlayerChunkMap playerManager = ((CraftWorld) getWorld()).getHandle().getPlayerChunkMap();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayer player = ((CraftPlayer) ((BukkitPlayer) players[i]).parent).getHandle();
-                if (!playerManager.a(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.a(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -445,8 +445,8 @@ public class BukkitQueue_1_10 extends BukkitQueue_0<net.minecraft.server.v1_10_R
                 }
             });
             packet.a(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((CraftPlayer) ((BukkitPlayer) player).parent).getHandle().playerConnection.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((CraftPlayer) ((BukkitPlayer) players[i]).parent).getHandle().playerConnection.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
index fb8f1fe5..02de3f73 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_11/BukkitQueue_1_11.java
@@ -406,11 +406,11 @@ public class BukkitQueue_1_11 extends BukkitQueue_0<net.minecraft.server.v1_11_R
         try {
             PlayerChunkMap playerManager = ((CraftWorld) getWorld()).getHandle().getPlayerChunkMap();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayer player = ((CraftPlayer) ((BukkitPlayer) players[i]).parent).getHandle();
-                if (!playerManager.a(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.a(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -445,8 +445,8 @@ public class BukkitQueue_1_11 extends BukkitQueue_0<net.minecraft.server.v1_11_R
                 }
             });
             packet.a(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((CraftPlayer) ((BukkitPlayer) player).parent).getHandle().playerConnection.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((CraftPlayer) ((BukkitPlayer) players[i]).parent).getHandle().playerConnection.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
index e0c8b1dc..252f79fb 100644
--- a/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
+++ b/bukkit/src/main/java/com/boydti/fawe/bukkit/v1_9/BukkitQueue_1_9_R1.java
@@ -267,11 +267,11 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<net.minecraft.server.v1_9_
         try {
             PlayerChunkMap playerManager = ((CraftWorld) getWorld()).getHandle().getPlayerChunkMap();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayer player = ((CraftPlayer) ((BukkitPlayer) players[i]).parent).getHandle();
-                if (!playerManager.a(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.a(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -306,8 +306,8 @@ public class BukkitQueue_1_9_R1 extends BukkitQueue_0<net.minecraft.server.v1_9_
                 }
             });
             packet.a(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((CraftPlayer) ((BukkitPlayer) player).parent).getHandle().playerConnection.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((CraftPlayer) ((BukkitPlayer) players[i]).parent).getHandle().playerConnection.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java b/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java
index 375a2b11..da2b6bda 100644
--- a/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java
+++ b/forge110/src/main/java/com/boydti/fawe/forge/v110/ForgeQueue_All.java
@@ -154,11 +154,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         try {
             PlayerChunkMap playerManager = ((WorldServer) getWorld()).getPlayerChunkMap();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayerMP player = (EntityPlayerMP) ((ForgePlayer) players[i]).parent;
-                if (!playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -192,8 +192,8 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 }
             });
             packet.readPacketData(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((EntityPlayerMP) ((ForgePlayer) player).parent).connection.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((EntityPlayerMP) ((ForgePlayer) players[i]).parent).connection.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java b/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java
index a790e9f7..5863ddff 100644
--- a/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java
+++ b/forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeQueue_All.java
@@ -169,11 +169,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         try {
             PlayerChunkMap playerManager = ((WorldServer) getWorld()).getPlayerChunkMap();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayerMP player = (EntityPlayerMP) ((ForgePlayer) players[i]).parent;
-                if (!playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -207,8 +207,8 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 }
             });
             packet.readPacketData(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((EntityPlayerMP) ((ForgePlayer) player).parent).connection.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((EntityPlayerMP) ((ForgePlayer) players[i]).parent).connection.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
index 198a085d..ea3a0ccb 100644
--- a/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
+++ b/forge1710/src/main/java/com/boydti/fawe/forge/v1710/ForgeQueue_All.java
@@ -330,11 +330,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         try {
             PlayerManager playerManager = ((WorldServer) getWorld()).getPlayerManager();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayerMP player = (EntityPlayerMP) ((ForgePlayer) players[i]).parent;
-                if (!playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -368,8 +368,8 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 }
             });
             packet.readPacketData(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((EntityPlayerMP) ((ForgePlayer) player).parent).playerNetServerHandler.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((EntityPlayerMP) ((ForgePlayer) players[i]).parent).playerNetServerHandler.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java b/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java
index f0ef2cc3..5af4d528 100644
--- a/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java
+++ b/forge189/src/main/java/com/boydti/fawe/forge/v189/ForgeQueue_All.java
@@ -211,11 +211,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         try {
             PlayerManager playerManager = ((WorldServer) getWorld()).getPlayerManager();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayerMP player = (EntityPlayerMP) ((ForgePlayer) players[i]).parent;
-                if (!playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -249,8 +249,8 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 }
             });
             packet.readPacketData(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((EntityPlayerMP) ((ForgePlayer) player).parent).playerNetServerHandler.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((EntityPlayerMP) ((ForgePlayer) players[i]).parent).playerNetServerHandler.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();
diff --git a/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java b/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java
index 430d8b3e..37c97836 100644
--- a/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java
+++ b/forge194/src/main/java/com/boydti/fawe/forge/v194/ForgeQueue_All.java
@@ -252,11 +252,11 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
         try {
             PlayerChunkMap playerManager = ((WorldServer) getWorld()).getPlayerChunkMap();
             boolean watching = false;
+            boolean[] watchingArr = new boolean[players.length];
             for (int i = 0; i < players.length; i++) {
                 EntityPlayerMP player = (EntityPlayerMP) ((ForgePlayer) players[i]).parent;
-                if (!playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
-                    players[i] = null;
-                } else {
+                if (playerManager.isPlayerWatchingChunk(player, chunk.getX(), chunk.getZ())) {
+                    watchingArr[i] = true;
                     watching = true;
                 }
             }
@@ -290,8 +290,8 @@ public class ForgeQueue_All extends NMSMappedFaweQueue<World, Chunk, ExtendedBlo
                 }
             });
             packet.readPacketData(buffer);
-            for (FawePlayer player : players) {
-                if (player != null) ((EntityPlayerMP) ((ForgePlayer) player).parent).connection.sendPacket(packet);
+            for (int i = 0; i < players.length; i++) {
+                if (watchingArr[i]) ((EntityPlayerMP) ((ForgePlayer) players[i]).parent).connection.sendPacket(packet);
             }
         } catch (IOException e) {
             e.printStackTrace();