e

Author: Yuta12342

source/archipelago/APPlayState.hx

@@ -32,6 +32,7 @@ class APPlayState extends PlayState {
     public var checkedNotes:Array<Note> = new Array<Note>();
 
     public static var currentMod = "";
+    public static var currentSong = "";
     public static var deathLinkPacket:Dynamic;
     public static var effectiveScrollSpeed:Float;
 	public static var effectiveDownScroll:Bool;

source/states/freeplay/FreeplayState.hx

@@ -988,7 +988,10 @@ class FreeplayState extends MusicBeatState
 							alreadyClicked = true;
 							MusicBeatState.reopen = false; //Fix a sticker bug
 							LoadingState.prepareToSong();
-							LoadingState.loadAndSwitchState(APEntryState.inArchipelagoMode ? new archipelago.APPlayState() : new states.PlayState());
+							LoadingState.loadAndSwitchState(APEntryState.inArchipelagoMode ? new archipelago.APPlayState().funcAndReturn(function(ps:archipelago.APPlayState) {
+								archipelago.APPlayState.currentSong = fpManager.songList[curSelected].songName;
+								archipelago.APPlayState.currentMod = fpManager.songList[curSelected].folder;
+							}) : new PlayState());
 						}
 						#if !SHOW_LOADING_SCREEN FlxG.sound.music.stop(); #end
 						stopMusicPlay = true;

source/states/freeplay/osu/DifficultySelectorSubState.hx

@@ -146,7 +146,13 @@ class DifficultySelectorSubState extends MusicBeatSubstate
                     return;
                 }
                 LoadingState.prepareToSong();
-                LoadingState.loadAndSwitchState(archipelago.APEntryState.inArchipelagoMode ? new archipelago.APPlayState() : new states.PlayState());
+                LoadingState.loadAndSwitchState(archipelago.APEntryState.inArchipelagoMode ? new archipelago.APPlayState().funcAndReturn(function(ps:archipelago.APPlayState) {
+					@:privateAccess
+                    {
+                    archipelago.APPlayState.currentSong = OsuFreeplayState.instance.fpManager.songList[OsuFreeplayState.instance.curSelected].songName;
+					archipelago.APPlayState.currentMod = OsuFreeplayState.instance.fpManager.songList[OsuFreeplayState.instance.curSelected].folder;
+                    }
+				}) : new states.PlayState());
             }
             if (FlxG.keys.firstJustPressed() != FlxKey.NONE && missingText.visible)
 			{

source/substates/RankingSubstate.hx

@@ -216,7 +216,9 @@ class RankingSubstate extends MusicBeatSubstate
 						var attempts = 0;
 
 
-						var locationId = (PlayState.SONG.song);
+						var locationId = (archipelago.APPlayState.currentSong != null && archipelago.APPlayState.currentSong.trim() != "")
+							? archipelago.APPlayState.currentSong
+							: PlayState.SONG.song;
 						if (APInfo.unlockMethod != "Note Checks") {
 							trace(archipelago.APPlayState.currentMod);
 							// if (archipelago.APPlayState.currentMod.trim() != "")

source/yutautil/CollectionUtils.hx

@@ -663,6 +663,12 @@ class CollectionUtils
 		return null;
 	}
 
+	public static inline function global<O>(input:O):Class<O>
+	{
+		return Type.getClass(input) != null ? Type.getClass(input) : throw "Input has no class (null)";
+	}
+
+
 	public static inline function objectDynamic<T>(input:Dynamic):Dynamic
 	{
 		if (Std.is(input, Array))