[Savestates] Fix loading savestates with RPs from commands softlocking

Author: ScribbleTAS

src/main/java/com/minecrafttas/tasmod/commands/CommandSavestate.java

@@ -42,17 +42,41 @@ public void execute(MinecraftServer server, ICommandSender sender, String[] args
 		} else if (args.length >= 1) {
 			if ("save".equals(args[0])) {
 				if (args.length == 1) {
-					saveLatest();
+					TASmod.gameLoopSchedulerServer.add(() -> {
+						try {
+							saveLatest();
+						} catch (CommandException e) {
+							e.printStackTrace();
+						}
+					});
 				} else if (args.length == 2) {
-					saveWithIndex(args);
+					TASmod.gameLoopSchedulerServer.add(() -> {
+						try {
+							saveWithIndex(args);
+						} catch (CommandException e) {
+							e.printStackTrace();
+						}
+					});
 				} else {
 					throw new CommandException("Too many arguments!", new Object[] {});
 				}
 			} else if ("load".equals(args[0])) {
 				if (args.length == 1) {
-					loadLatest();
+					TASmod.gameLoopSchedulerServer.add(() -> {
+						try {
+							loadLatest();
+						} catch (CommandException e) {
+							e.printStackTrace();
+						}
+					});
 				} else if (args.length == 2) {
-					loadLatest(args);
+					TASmod.gameLoopSchedulerServer.add(() -> {
+						try {
+							loadLatest(args);
+						} catch (CommandException e) {
+							e.printStackTrace();
+						}
+					});
 				} else {
 					throw new CommandException("Too many arguments!", new Object[] {});
 				}

src/main/java/com/minecrafttas/tasmod/mixin/savestates/MixinMinecraftServer.java

@@ -0,0 +1,22 @@
+package com.minecrafttas.tasmod.mixin.savestates;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.minecrafttas.tasmod.savestates.handlers.SavestateResourcePackHandler;
+
+import net.minecraft.server.MinecraftServer;
+
+@Mixin(MinecraftServer.class)
+public class MixinMinecraftServer {
+
+	@Inject(method = "reload", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/players/PlayerList;reloadResources()V"))
+	public void inject_reload(CallbackInfo ci) {
+		if (SavestateResourcePackHandler.clientRPLatch != null && SavestateResourcePackHandler.clientRPLatch.getCount() > 0) {
+			System.out.println("Countdown");
+			SavestateResourcePackHandler.clientRPLatch.countDown();
+		}
+	}
+}

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

@@ -4,6 +4,7 @@
 import java.nio.file.Path;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -31,6 +32,8 @@ public class SavestateResourcePackHandler implements EventSavestate.EventServerL
 
 	private CompletableFuture<String> future;
 
+	public static CountDownLatch clientRPLatch;
+
 	@Override
 	public void onServerLoadstate(MinecraftServer server, int index, Path target, Path current) {
 		if (server.getResourcePackUrl().isEmpty() || server.isDedicatedServer())
@@ -70,8 +73,16 @@ public void onClientPacket(PacketID id, ByteBuffer buf, String username) throws
 		switch (packetId) {
 			case SAVESTATE_CLEAR_RESOURCEPACK:
 				mc.addScheduledTask(() -> {
+					clientRPLatch = new CountDownLatch(1);
 					ResourcePackRepositoryDuck duck = (ResourcePackRepositoryDuck) mc.getResourcePackRepository();
 					duck.clearServerResourcePackBlocking();
+
+					try {
+						clientRPLatch.await(30, TimeUnit.SECONDS);
+					} catch (InterruptedException e) {
+						e.printStackTrace();
+					}
+
 					try {
 						TASmodClient.client.send(new TASmodBufferBuilder(TASmodPackets.SAVESTATE_CLEAR_RESOURCEPACK));
 					} catch (Exception e) {

src/main/resources/tasmod.mixin.json

@@ -16,6 +16,7 @@
 		"savestates.MixinChunkProviderServer",
 		"savestates.MixinNetHandlerPlayServer",
 		"savestates.MixinScoreboard",
+		"savestates.MixinMinecraftServer",
 
 		// Events
 		"events.MixinEntityPlayerMP",