From fce80c9ac1029c8145772dc19f4ddb5fd307db70 Mon Sep 17 00:00:00 2001 From: DodoBirb Date: Sun, 19 Feb 2023 18:09:56 +1100 Subject: [PATCH] Fixed crash when switching teams while in PB explosion --- Export_Code/gml_Object_oCharacter_Collision_437.gml | 2 +- Export_Code/gml_Object_oPBomb_Alarm_0.gml | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Export_Code/gml_Object_oCharacter_Collision_437.gml b/Export_Code/gml_Object_oCharacter_Collision_437.gml index acbc9cc..3696492 100644 --- a/Export_Code/gml_Object_oCharacter_Collision_437.gml +++ b/Export_Code/gml_Object_oCharacter_Collision_437.gml @@ -1,4 +1,4 @@ -if (other.sax != global.sax && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR) +if (other.sax != global.sax && invincible == 0 && canbehit && state != IDLE && state != SAVING && state != SAVINGFX && state != SAVINGSHIPFX && state != SAVINGSHIP && state != ELEVATOR && state != GFELEVATOR && other.myid != 0) { pbomb_drain = 2 if (!global.spectator) diff --git a/Export_Code/gml_Object_oPBomb_Alarm_0.gml b/Export_Code/gml_Object_oPBomb_Alarm_0.gml index 108d23a..b0b17c7 100644 --- a/Export_Code/gml_Object_oPBomb_Alarm_0.gml +++ b/Export_Code/gml_Object_oPBomb_Alarm_0.gml @@ -1,11 +1,15 @@ if (special == 0) { - instance_create(x, y, oPBombExpl) expl = instance_create(x, y, oPBombExpl) + expl.myid = 0 + expl = instance_create(x, y, oPBombExpl) + expl.myid = 0 expl.image_angle = 90 expl = instance_create(x, y, oPBombExpl) + expl.myid = 0 expl.image_angle = 180 expl = instance_create(x, y, oPBombExpl) + expl.myid = 0 expl.image_angle = 270 sfx_play(sndPBombExpl) }