1 files changed, 21 insertions, 26 deletions
diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index bb7b6fdf..7e8cb8ab 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -400,35 +400,24 @@ L_ReadyToTeleport:
 L_AskToTeleport:
     // Check area users just to give a hint if there are players around
     // $@ILLIA_HERO$ $@ILLIA_HELPER1$ $@ILLIA_HELPER2$ $@ILLIA_HELPER3$
-    if (attachrid($@ILLIA_HELPER1$))
-        goto L_CheckHelper1;
-    goto L_NotEveryoneHere;
-
-L_CheckHelper1:
-    if (isin("007-1.gat", 66, 73, 92, 88))
-        goto L_CheckNext;
-    goto L_NotEveryoneHere;
-
-L_CheckNext:
+    if (!(attachrid(getcharid(3,$@ILLIA_HELPER1$))))
+        goto L_NotEveryoneHere;
+    if (!(isin("007-1.gat", 66, 73, 92, 88)))
+        goto L_NotEveryoneHere;
     detachrid;
-    if (attachrid($@ILLIA_HELPER2$))
-        goto L_CheckHelper2;
-    goto L_NotEveryoneHere;
-
-L_CheckHelper2:
-    if (isin("007-1.gat", 66, 73, 92, 88))
-        goto L_CheckNext2;
-    goto L_NotEveryoneHere;
-
-L_CheckNext2:
+    if (!(attachrid(getcharid(3,$@ILLIA_HELPER2$))))
+        goto L_NotEveryoneHere;
+    if (!(isin("007-1.gat", 66, 73, 92, 88)))
+        goto L_NotEveryoneHere;
     detachrid;
-    if (attachrid($@ILLIA_HELPER3$))
-        goto L_TeleportFinal;
-    goto L_NotEveryoneHere;
-
-L_TeleportFinal:
+    if (!(attachrid(getcharid(3,$@ILLIA_HELPER3$))))
+        goto L_NotEveryoneHere;
+    if (!(isin("007-1.gat", 66, 73, 92, 88)))
+        goto L_NotEveryoneHere;
     detachrid;
-    if (!attachrid($@ILLIA_HERO$))
+    if (!(attachrid(getcharid(3,$@ILLIA_HERO$))))
+        goto L_NotEveryoneHere;
+    if (!(isin("007-1.gat", 66, 73, 92, 88)))
         goto L_NotEveryoneHere;
     mes "[Valia]";
     mes "\"Everyone seems to be here. Make sure to stay close to me.\"";
@@ -687,6 +676,12 @@ OnTimer300000:
         end;
     npctalk $@ILLIA_HERO$ + ", you and your missing comrades made me lose a precious time! Out of my sight!";
     emotion EMOTE_UPSET;
+    if (attachrid($@ILLIA_HERO_ID))
+        goto L_KillHero;
+    goto L_EndQuest;
+
+L_KillHero:
+    percentheal -100, 0;
     goto L_EndQuest;
 
 }