Merge remote-tracking branch 'origin/dev' into dev

src/main/java/noppes/npcs/client/ClientTickHandler.java

@@ -10,6 +10,7 @@ import kamkeel.npcs.client.renderer.lightning.LightningBolt;
 import kamkeel.npcs.controllers.AbilityController;
 import kamkeel.npcs.controllers.data.telegraph.TelegraphManager;
 import kamkeel.npcs.network.PacketClient;
+import kamkeel.npcs.network.packets.data.RequestProperSpawnData;
 import kamkeel.npcs.network.packets.player.CheckPlayerValue;
 import kamkeel.npcs.network.packets.player.InputDevicePacket;
 import kamkeel.npcs.network.packets.player.ScreenSizePacket;
@@ -60,6 +61,7 @@ public class ClientTickHandler {
             if (mc.theWorld == null) {
                 ClientCacheHandler.clearCache();
                 ClientAbilityState.reset();
+                RequestProperSpawnData.clear();
             }
             this.prevWorld = mc.theWorld;
         }
@@ -200,6 +202,8 @@ public class ClientTickHandler {
             return;
 
         if (mc.theWorld.getTotalWorldTime() % 20 == 0) { // Update every second
+            if (RequestProperSpawnData.canDoBatchUpdate())
+                RequestProperSpawnData.handleBacklog();
             updateCompassMarks();
         }
     }