Skip to content

Commit 68be74c

Browse files
committed
fix sts v2.2 crash in death screens (fixes #587)
1 parent 5b8ed66 commit 68be74c

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Unreleased]
44

5+
### Bug fixes
6+
7+
* Compatibility with Slay the Spire v2.2 (fixes crash in death screens) (thanks A Cake Wearing A Hat and Celicath for reporting!)
8+
59
## [v1.9.1] - 2020-11-01
610

711
### Bug fixes

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<maven.compiler.source>1.8</maven.compiler.source>
1212
<maven.compiler.target>1.8</maven.compiler.target>
1313
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
14-
<SlayTheSpire.version>01-27-2020</SlayTheSpire.version>
15-
<ModTheSpire.version>3.15.0</ModTheSpire.version>
14+
<SlayTheSpire.version>11-29-2020</SlayTheSpire.version>
15+
<ModTheSpire.version>3.18.0</ModTheSpire.version>
1616

1717
<!--
1818
You need to set a STEAMAPPS_PATH environment variable to enable Maven to find the dependencies.

src/main/java/stsjorbsmod/patches/VoiceoverMasterPatch.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import com.megacrit.cardcrawl.monsters.MonsterGroup;
1616
import com.megacrit.cardcrawl.neow.NeowEvent;
1717
import com.megacrit.cardcrawl.screens.DeathScreen;
18+
import com.megacrit.cardcrawl.screens.GameOverScreen;
19+
import com.megacrit.cardcrawl.screens.VictoryScreen;
1820
import javassist.CannotCompileException;
1921
import javassist.expr.ExprEditor;
2022
import javassist.expr.FieldAccess;
@@ -40,7 +42,7 @@ public static MonsterGroup Postfix(MonsterGroup __originalRetVal, String key) {
4042
public static class DeathScreen_ctor {
4143
@SpirePostfixPatch
4244
public static void Postfix(DeathScreen __this) {
43-
VoiceoverMaster.playAfterDelay(__this.isVictory ? "death_victory" : "death", 2.0F);
45+
VoiceoverMaster.playAfterDelay(DeathScreen.isVictory ? "death_victory" : "death", 2.0F);
4446
}
4547
}
4648

0 commit comments

Comments
 (0)