diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateWorldHandler.java b/src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateWorldHandler.java
index 33694a9c..bcabd82c 100644
--- a/src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateWorldHandler.java
+++ b/src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateWorldHandler.java
@@ -157,7 +157,8 @@ private void addPlayerToChunkMap(WorldServer world, EntityPlayerMP player) {
 		} else {
 			playerChunkMap.addPlayer(player);
 		}
-		world.getChunkProvider().provideChunk(playerChunkPosX, playerChunkPosY);
+		Chunk chunk = world.getChunkProvider().provideChunk(playerChunkPosX, playerChunkPosY);
+		chunk.addEntity(player);
 
 		world.spawnEntity(player);
 	}
@@ -239,7 +240,6 @@ public void loadAllWorlds(String string, String string2) {
 			}
 
 			server.worlds[i].addEventListener(new ServerWorldEventHandler(server, server.worlds[i]));
-			server.worlds[i].tick();	// TODO I give up...
 		}
 
 		server.getPlayerList().setPlayerManager(server.worlds);