Fixes for Freeplay Sync Routine.

Author: Yuta12342

source/archipelago/APDisconnectSubstate.hx

@@ -24,6 +24,13 @@ class APDisconnectSubstate extends FlxSubState
 		super(FlxColor.fromRGBFloat(0, 0, 0, .5));
 		_ap = ap;
 		Cursor.show();
+
+		// AP.disconnect_socket();
+		states.ExitState.addExitCallback(function() {
+			var restartProcess = new Process("Mixtape.exe", ["APDisconnectError", "restart"]);
+			
+		});
+		FlxG.switchState(new states.ExitState());
 	}
 
 	public function setSeed(seed:String):Void {

source/archipelago/APGameState.hx

@@ -574,7 +574,11 @@ class APGameState {
         }
         isSync = false;
         info().casualSync = false;
-        if (states.FreeplayState.instance != null) states.FreeplayState.instance.reloadSongs(true);
+        try {
+            if (states.FreeplayState.instance != null) states.FreeplayState.instance.reloadSongs(true);
+        } catch (e:Dynamic) {
+            archipelago.APItem.popup("Error", "You need to wait for all of the data to load, silly!", true);
+        }
     }
 
     // A bandage fix till we have enough brainpower to fix this properly

source/archipelago/APPlayState.hx

@@ -1396,11 +1396,15 @@ class APPlayState extends PlayState {
             return;
         }
 
-        if (effectMap.exists(effect)) {
+        try {
+            if (effectMap.exists(effect)) {
             effectMap.get(effect)();
             trace('running effect: $effect');
-        } else {
+            } else {
             trace("Effect not found: " + effect);
+            }
+        } catch (e:Dynamic) {
+            trace("Error while executing effect: " + effect + " - " + e);
         }
     }
 

source/archipelago/Client.hx

@@ -1442,6 +1442,11 @@ class Client {
 						APGameState.instance.APLocations = missingLocations.concat(checkedLocations);
 						APGameState.instance.APItems = APGameState.instance.findSpecialItems();
 						APGameState.instance.initSaveData();
+						try {
+							if (states.FreeplayState.instance != null) states.FreeplayState.instance.reloadSongs(true);
+						} catch (e:Dynamic) {
+							backend.MusicBeatState.resetState();
+						}
 						return ArchPopup.startPopupCustom("The game can now be played!", "You are now connected to the server. Have fun!", "archColor");
 					}
 

source/archipelago/CountdownPopup.hx

@@ -84,14 +84,17 @@ class CountdownPopup extends openfl.display.Sprite {
                 FlxG.sound.play(Paths.sound('countdown/end'));
             }
     }
-
     private function drawTextAt(text:FlxText, str:String, textX:Float, textY:Float) {
-        text.text = str;
-        text.updateHitbox();
-        var clonedBitmap:BitmapData = text.graphic.bitmap.clone();
-        bitmaps.push(clonedBitmap);
-        graphics.beginBitmapFill(clonedBitmap, new Matrix(1, 0, 0, 1, textX, textY), false, false);
-        graphics.drawRect(textX, textY, text.width + textX, text.height + textY);
+        try {
+            text.text = str;
+            text.updateHitbox();
+            var clonedBitmap:BitmapData = text.graphic.bitmap.clone();
+            bitmaps.push(clonedBitmap);
+            graphics.beginBitmapFill(clonedBitmap, new Matrix(1, 0, 0, 1, textX, textY), false, false);
+            graphics.drawRect(textX, textY, text.width + textX, text.height + textY);
+        } catch (e:Dynamic) {
+            trace('Error in drawTextAt: ' + e);
+        }
     }
 
     private function update(e:Event) {