From e40da4513e24db021d5ccc2a856e0f00dbe8d6f6 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sat, 6 Jul 2019 17:19:00 -0300
Subject: This should fix bug 02331.LOGIC

---
 npc/023-3-1/logic.txt | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'npc/023-3-1/logic.txt')

diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt
index 5e62775cb..42d223d8b 100644
--- a/npc/023-3-1/logic.txt
+++ b/npc/023-3-1/logic.txt
@@ -236,9 +236,10 @@ OnE12:
     // A warp to non-instanced version to prevent death sprite from showing up.
     unitwarp(@ISBAMUTH, "023-3-1", 45, 45);
     unitwarp(@SCOUT, "023-3-1", 45, 45);
-    unitkill(@ISBAMUTH);
-    unitkill(@SCOUT);
+    .@isb=@ISBAMUTH;
     @ISBAMUTH=0;
+    unitkill(.@isb);
+    unitkill(@SCOUT);
     setq1 FrostiaQuest_Homunculus, 3;
     mapannounce(.@m$, "##2"+l("Victory Conditions: Defeat all enemies!"), 0);
     mapannounce(.@m$, "##1"+l("Defeat Conditions: Your death!"), 0);
@@ -270,6 +271,8 @@ OnW02:
 
 // Secret events. Do not handle Isbamuth death as it should be impossible...
 OnIsbamuthDefeat:
+    if (!@ISBAMUTH)
+        end;
     Exception(l("Why do you bully me! - This is a bug: 02331.LOGIC.OID"), RB_DISPBOTTOM|RB_DEBUGMES);
     deltimer(.@n$+"::OnW01");
     deltimer(.@n$+"::OnW02");
-- 
cgit v1.2.3-60-g2f50