Fixed crash when switching teams while in PB explosion

3 years ago · fce80c9ac1
parent 3e27a11d3a
commit fce80c9ac1
2 changed files with 6 additions and 2 deletions
--- 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)
--- 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)
 }