[Savestates] Trying to fix crashes and errors

- Trying to fix errors with the future task queue during loadstate - Trying to fix a crash with a tickList being out of sync
MinecraftTAS · Jul 27, 2024 · 030e215 · 030e215
1 parent c8649a1
commit 030e215
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/src/main/java/com/minecrafttas/tasmod/mixin/MixinMinecraftServer.java b/src/main/java/com/minecrafttas/tasmod/mixin/MixinMinecraftServer.java
@@ -13,6 +13,7 @@
 import com.minecrafttas.mctcommon.events.EventListenerRegistry;
 import com.minecrafttas.tasmod.TASmod;
 import com.minecrafttas.tasmod.events.EventServer.EventServerTickPost;
+import com.minecrafttas.tasmod.savestates.SavestateHandlerServer.SavestateState;
 
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
@@ -109,12 +110,15 @@ public void redirectThreadSleep(long msToTick) {
 
 		TASmod.gameLoopSchedulerServer.runAllTasks();
 
-		synchronized (this.futureTaskQueue) {
-			while (!this.futureTaskQueue.isEmpty()) {
-				try {
-					((FutureTask<?>) this.futureTaskQueue.poll()).run();
-				} catch (Throwable var9) {
-					var9.printStackTrace();
+		boolean stopTaskQueue = TASmod.savestateHandlerServer != null && TASmod.savestateHandlerServer.state == SavestateState.LOADING;
+		if (!stopTaskQueue) {
+			synchronized (this.futureTaskQueue) {
+				while (!this.futureTaskQueue.isEmpty()) {
+					try {
+						((FutureTask<?>) this.futureTaskQueue.poll()).run();
+					} catch (Throwable var9) {
+						var9.printStackTrace();
+					}
 				}
 			}
 		}

diff --git a/src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java b/src/main/java/com/minecrafttas/tasmod/savestates/SavestateHandlerServer.java
@@ -395,11 +395,11 @@ public void loadState(int savestateIndex, boolean tickrate0, boolean changeIndex
 			ChunkHandler.addPlayerToServerChunk(player);
 		});
 
-		WorldServer[] worlds = server.worlds;
-
-		for (WorldServer world : worlds) {
-			world.tick();
-		}
+//		WorldServer[] worlds = server.worlds;
+//
+//		for (WorldServer world : worlds) {
+//			world.tick();
+//		}
 
 		if (!tickrate0) {
 			TASmod.tickratechanger.pauseGame(false);
@@ -756,7 +756,7 @@ public void onServerPacket(PacketID id, ByteBuffer buf, String username) throws
 
 			case SAVESTATE_LOAD:
 				int indexing = TASmodBufferBuilder.readInt(buf);
-				player.getServerWorld().addScheduledTask(() -> {
+				TASmod.gameLoopSchedulerServer.add(() -> {
 					try {
 						TASmod.savestateHandlerServer.loadState(indexing, true);
 					} catch (LoadstateException e) {

diff --git a/src/main/java/com/minecrafttas/tasmod/util/Monitor.java b/src/main/java/com/minecrafttas/tasmod/util/Monitor.java
@@ -63,5 +63,4 @@ public static Object accessField(Object objectToAccess, String fieldname) {
 		}
 		return out;
 	}
-
 }
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     		return out;
     	}
     }