e

Author: Yuta12342

source/archipelago/APGameState.hx

@@ -934,6 +934,8 @@ class APGameState
 	{
 		trace("Bounce packet received: " + haxe.Json.stringify(data));
 
+		info()?.tagsManager?.syncToClient();
+
 		// Check for TrapLink packet first
 		if (Reflect.hasField(data, "trap_name"))
 		{
@@ -1208,7 +1210,8 @@ class APGameState
 		{
 			APEntryState.ap = null;
 		}
-	}		public function getSongAndMod(songName:String):{song:String, ?mod:String}
+	}
+	public function getSongAndMod(songName:String):{song:String, ?mod:String}
 		{
 			var input = songName;
 			var modName = "";

source/archipelago/APTagsManager.hx

@@ -265,6 +265,22 @@ class APTagsManager {
         }
     }
 
+    // public function emergencySync():Void {
+    //     // Only sync if tags differ between manager and client
+    //     if (client != null) {
+    //         var clientTags = client.tags != null ? client.tags : [];
+    //         var tagsMatch = _tags.length == clientTags.length && _tags.map(function(tag, i) return tag == clientTags[i]);
+    //         if (!tagsMatch) {
+    //             syncToClient();
+    //             trace('APTagsManager: Emergency sync performed (tags differed)');
+    //         } else {
+    //             trace('APTagsManager: Emergency sync skipped (tags already match)');
+    //         }
+    //     } else {
+    //         trace('APTagsManager: Emergency sync failed (client is null)');
+    //     }
+    // }
+
     /**
      * Sync from the client to update internal state
      * Call this if the client's tags were modified externally

source/archipelago/Client.hx

@@ -526,8 +526,7 @@ class Client {
 			trace('Death link not sent - state: $state, deathByLink: ${APPlayState.deathByLink}, deathlink enabled: ${ClientPrefs.data.deathlink}');
 		}
 
-		// Removed the redundant toggleDeathLink call here as it may cause unexpected tag changes
-		// The death link state should only be toggled when explicitly changing settings, not when sending
+		tagsManager.syncToClient();
 	}
 
 
@@ -558,7 +557,7 @@ class Client {
 	var currentTags:Array<String> = [];
 
 	inline function get_tags()
-		return currentTags;
+		return _tags;
 
 	inline function get_tagsManager():APTagsManager {
 		if (_tagsManager == null) {
@@ -1077,6 +1076,10 @@ class Client {
 		if (_ws != null)
 			process_queue();
 
+		if (_tags != currentTags) {
+			tagsManager.syncToClient();
+		}
+
 
 		// var needDataPackage = if (_gotDataPackage) false else true;
 		// try {