diff --git a/nms-patches/WorldServer.patch b/nms-patches/WorldServer.patch
index 4ad2df8abc..7a50933021 100644
--- a/nms-patches/WorldServer.patch
+++ b/nms-patches/WorldServer.patch
@@ -182,15 +182,15 @@
              return entityliving != null && entityliving.isAlive() && this.f(entityliving.getChunkCoordinates());
          });
  
-@@ -421,7 +485,7 @@
+@@ -419,7 +483,7 @@
+             while (iterator.hasNext()) {
+                 EntityPlayer entityplayer = (EntityPlayer) iterator.next();
  
-                 if (entityplayer.isSpectator()) {
+-                if (entityplayer.isSpectator()) {
++                if (entityplayer.isSpectator() || (entityplayer.fauxSleeping && !entityplayer.isSleeping())) { // CraftBukkit
                      ++i;
--                } else if (entityplayer.isSleeping()) {
-+                } else if (entityplayer.isSleeping() || entityplayer.fauxSleeping) { // CraftBukkit
+                 } else if (entityplayer.isSleeping()) {
                      ++j;
-                 }
-             }
 @@ -437,10 +501,22 @@
      }