[Savestate] Fix player not being updated

Author: ScribbleTAS

src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestatePlayerHandler.java

@@ -32,6 +32,8 @@
 import com.minecrafttas.tasmod.savestates.gui.GuiSavestateSavingScreen;
 import com.minecrafttas.tasmod.util.LoggerMarkers;
 
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.entity.Entity;
@@ -143,6 +145,8 @@ public void loadAndSendMotionToPlayer() {
 			player.clearActivePotions();
 
 			player.readFromNBT(nbttagcompound);
+			player.setWorld(this.server.getWorld(player.dimension));
+			player.interactionManager.setWorld((WorldServer) player.world);
 
 			LOGGER.debug(LoggerMarkers.Savestate, "Sending motion to {}", player.getName());
 
@@ -254,6 +258,7 @@ public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws
 		}
 	}
 
+	@Environment(EnvType.CLIENT)
 	@Override
 	public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws PacketNotImplementedException, WrongSideException, Exception {
 		TASmodPackets packet = (TASmodPackets) id;

src/main/java/com/minecrafttas/tasmod/savestates/handlers/SavestateWorldHandler.java

@@ -2,7 +2,6 @@
 
 import static com.minecrafttas.tasmod.TASmod.LOGGER;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import com.minecrafttas.tasmod.mixin.savestates.AccessorPlayerChunkMap;
@@ -13,7 +12,6 @@
 import com.minecrafttas.tasmod.util.LoggerMarkers;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.entity.EntityTracker;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.server.MinecraftServer;
@@ -160,6 +158,9 @@ private void addPlayerToChunkMap(WorldServer world, EntityPlayerMP player) {
 			playerChunkMap.addPlayer(player);
 		}
 		world.getChunkProvider().provideChunk(playerChunkPosX, playerChunkPosY);
+
+		world.addWeatherEffect(player);
+		world.spawnEntity(player);
 	}
 
 	/**
@@ -210,11 +211,6 @@ public void sendChunksToClient() {
 	}
 
 	public void loadAllWorlds(String string, String string2) {
-		List<EntityTracker> trackers = new ArrayList<>();
-		for (WorldServer world : server.worlds) {
-			trackers.add(world.entityTracker);
-		}
-
 		server.convertMapIfNeeded(string);
 		server.worlds = new WorldServer[3];
 		server.timeOfLastDimensionTick = new long[server.worlds.length][100];
@@ -239,10 +235,8 @@ public void loadAllWorlds(String string, String string2) {
 
 			if (i == 0) {
 				server.worlds[i] = (WorldServer) new WorldServer(server, iSaveHandler, worldInfo, j, server.profiler).init();
-				server.worlds[i].entityTracker = trackers.get(i);
 			} else {
 				server.worlds[i] = (WorldServer) new WorldServerMulti(server, iSaveHandler, j, server.worlds[0], server.profiler).init();
-				server.worlds[i].entityTracker = trackers.get(i);
 			}
 
 			server.worlds[i].addEventListener(new ServerWorldEventHandler(server, server.worlds[i]));

src/main/resources/tasmod.accesswidener

@@ -11,7 +11,4 @@ accessible field net/minecraft/world/World worldInfo Lnet/minecraft/world/storag
 
 accessible method net/minecraft/world/storage/SaveHandler setSessionLock ()V
 
-accessible field net/minecraft/client/settings/KeyBinding CATEGORY_ORDER Ljava/util/Map;
-
-accessible field net/minecraft/world/WorldServer entityTracker Lnet/minecraft/entity/EntityTracker;
-mutable field net/minecraft/world/WorldServer entityTracker Lnet/minecraft/entity/EntityTracker;
+accessible field net/minecraft/client/settings/KeyBinding CATEGORY_ORDER Ljava/util/Map;