sobbing

Author: Z11Coding

source/archipelago/APGameState.hx

@@ -282,7 +282,6 @@ class APGameState {
     function addSongs(song:Array<NetworkItem>)
     {
         var nonSongs:Map<String, Int> = [];
-        var nonSongsNames:Array<String> = [];
         states.FreeplayState.curMissing.clear();
 
 
@@ -321,6 +320,7 @@ class APGameState {
                     break;
                 }
             }
+            
             if (firstParenIndex == -1 || !isModName(modName)) {
                 modName = "";
                 itemName = info().get_item_name(songName.item);
@@ -383,20 +383,19 @@ class APGameState {
             }
         }
 
-        for (item in nonSongsNames) {
-            trace(item);
-            if (haventranyet) {
-                if (!trapList.contains(item)) {
-                    ItemIndex = nonSongs.get(item);
-                    archipelago.APItem.createItemByName(item);
-                }
-            } else {
-                ItemIndex = nonSongs.get(item);
-                archipelago.APItem.createItemByName(item);
+        for (items in nonSongs.keys())
+        {
+            if (nonSongs.get(items) <= ItemIndex)
+            {
+                continue;
+            }
+            else
+            {
+                ItemIndex = nonSongs.get(items);
+                archipelago.APItem.createItemByName(items);
             }
         }
         archipelago.APItem.doCheck();
-        //haventranyet = false;
         isSync = false;
 
     }

source/archipelago/APPlayState.hx

@@ -1386,16 +1386,6 @@ effectMap = [
     // I feel bad for the poor soul that has this trigger on them multiple times
     public function triggerGhostChat()
     {
-        effectTimer.start(5, function(timer)
-        {
-            if (paused)
-                return;
-            if (startingSong)
-                return;
-            if (endingSong)
-                return;
-        }, 0);
-
         randoTimer.start(FlxG.random.float(5, 10), function(tmr:FlxTimer)
         {
             doEffect(effectArray[curEffect]);