Fix Magnificus Finale softlock related to BetterGemsDraw

Author: HumabHatterZed

InscryptionCommunityPatch/Card/Vanilla Ability Patches/GemsDrawFix.cs

@@ -1,5 +1,6 @@
 using DiskCardGame;
 using HarmonyLib;
+using InscryptionAPI.Card;
 using System.Collections;
 using UnityEngine;
 
@@ -16,11 +17,13 @@ private static bool FixGemsDraw(GemsDraw __instance, ref IEnumerator __result)
         return false;
     }
 
-    private static IEnumerator BetterGemsDraw(GemsDraw __instance)
+    public static IEnumerator BetterGemsDraw(GemsDraw __instance)
     {
         yield return __instance.PreSuccessfulTriggerSequence();
-        int numGems = Singleton<BoardManager>.Instance.PlayerSlotsCopy.FindAll(
-            x => x.Card != null && x.Card.Info.HasTrait(Trait.Gem)).Count;
+        Singleton<ViewManager>.Instance.SwitchToView(SaveManager.SaveFile.IsMagnificus ? View.WizardBattleSlots : View.Default);
+        yield return new WaitForSeconds(0.1f);
+
+        int numGems = Singleton<BoardManager>.Instance.PlayerSlotsCopy.Count(x => x.Card != null && x.Card.HasTrait(Trait.Gem));
 
         if (numGems == 0)
         {
@@ -29,18 +32,16 @@ private static IEnumerator BetterGemsDraw(GemsDraw __instance)
             yield return new WaitForSeconds(0.45f);
             yield break;
         }
-
-        Singleton<ViewManager>.Instance.SwitchToView(SaveManager.SaveFile.IsPart2 ? View.WizardBattleSlots : View.Hand);
-        yield return new WaitForSeconds(0.1f);
+        
         for (int i = 0; i < numGems; i++)
         {
-            if (SaveManager.SaveFile.IsPart2)
-                yield return Singleton<CardDrawPiles>.Instance.DrawCardFromDeck();
-            else
-            {
+            if (Singleton<CardDrawPiles3D>.Instance != null && Singleton<CardDrawPiles3D>.Instance.Pile != null) {
                 Singleton<CardDrawPiles3D>.Instance.Pile.Draw();
                 yield return Singleton<CardDrawPiles3D>.Instance.DrawCardFromDeck();
             }
+            else
+                yield return Singleton<CardDrawPiles>.Instance.DrawCardFromDeck();
+            
         }
         yield return __instance.LearnAbility(0.5f);
     }