From fa229946d42992138033e8e31237b9cca8c28cc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=8D=9A=7ENex?= <87421482+NexIsDumb@users.noreply.github.com> Date: Sat, 2 Mar 2024 17:26:13 +0100 Subject: [PATCH] another stupid bug --- source/funkin/game/PlayState.hx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/source/funkin/game/PlayState.hx b/source/funkin/game/PlayState.hx index ed5d4f5c..575c612c 100644 --- a/source/funkin/game/PlayState.hx +++ b/source/funkin/game/PlayState.hx @@ -1386,12 +1386,13 @@ class PlayState extends MusicBeatState * @param retrySFX SFX played whenever the player retries. Defaults to `retrySFX` (`gameOverEnd`) */ public function gameOver(?character:Character, ?deathCharID:String, ?gameOverSong:String, ?lossSFX:String, ?retrySFX:String) { + var charToUse:Character = character.getDefault(opponentMode ? dad : boyfriend); // Imma still make it check null later just in case dad or bf are also null for some weird scripts - Nex var event:GameOverEvent = scripts.event("onGameOver", EventManager.get(GameOverEvent).recycle( - character == null ? 0 : character.x, - character == null ? 0 : character.y, - character.getDefault(opponentMode ? dad : boyfriend), - deathCharID.getDefault(character != null ? character.gameOverCharacter : "bf-dead"), - character != null ? character.isPlayer : true, + charToUse == null ? 0 : charToUse.x, + charToUse == null ? 0 : charToUse.y, + charToUse, + deathCharID.getDefault(charToUse != null ? charToUse.gameOverCharacter : "bf-dead"), + charToUse != null ? charToUse.isPlayer : true, gameOverSong.getDefault(this.gameOverSong), lossSFX.getDefault(this.lossSFX), retrySFX.getDefault(this.retrySFX)