Fix for week 48

kiooeht · Nov 2, 2018 · d65554c · d65554c
1 parent 08485d0
commit d65554c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/src/main/java/com/evacipated/cardcrawl/mod/hubris/characters/FakePlayer.java b/src/main/java/com/evacipated/cardcrawl/mod/hubris/characters/FakePlayer.java
@@ -257,7 +257,7 @@ public String getVampireText()
     }
 
     @Override
-    protected void initializeStarterDeck()
+    public void initializeStarterDeck()
     {
 
     }

diff --git a/src/main/java/com/evacipated/cardcrawl/mod/hubris/patches/TheBottlerPatch.java b/src/main/java/com/evacipated/cardcrawl/mod/hubris/patches/TheBottlerPatch.java
@@ -2,12 +2,14 @@
 
 import com.evacipated.cardcrawl.mod.hubris.events.thebeyond.TheBottler;
 import com.evacipated.cardcrawl.modthespire.lib.*;
+import com.megacrit.cardcrawl.dungeons.AbstractDungeon;
+import com.megacrit.cardcrawl.random.Random;
 import javassist.CtBehavior;
 
 import java.util.ArrayList;
 
 @SpirePatch(
-        cls="com.megacrit.cardcrawl.dungeons.AbstractDungeon",
+        clz=AbstractDungeon.class,
         method="getEvent"
 )
 public class TheBottlerPatch
@@ -16,7 +18,7 @@ public class TheBottlerPatch
             locator=Locator.class,
             localvars={"tmp"}
     )
-    public static void Insert(ArrayList<String> tmp)
+    public static void Insert(Random rng, ArrayList<String> tmp)
     {
         if (!TheBottler.canAppear()) {
             tmp.remove(TheBottler.ID);
@@ -28,7 +30,7 @@ private static class Locator extends SpireInsertLocator
         @Override
         public int[] Locate(CtBehavior ctMethodToPatch) throws Exception
         {
-            Matcher finalMatcher = new Matcher.MethodCallMatcher("java.util.ArrayList", "isEmpty");
+            Matcher finalMatcher = new Matcher.MethodCallMatcher(ArrayList.class, "isEmpty");
             return LineFinder.findInOrder(ctMethodToPatch, finalMatcher);
         }
     }