1 files changed, 19 insertions, 22 deletions

diff --git a/world/map/npc/007-1/witch.txt b/world/map/npc/007-1/witch.txt
index 8259291a..0d16c0cc 100644
--- a/world/map/npc/007-1/witch.txt
+++ b/world/map/npc/007-1/witch.txt
@@ -248,21 +248,20 @@ L_ChooseHelper1:
         goto L_WrongHelper1;
     if (isloggedin(getcharid(3, $@ILLIA_HELPER1$)) == 0)
         goto L_HelperDoesNotExist1;
-    attachrid(getcharid(3, $@ILLIA_HELPER1$));
+    if (!(attachrid(getcharid(3, $@ILLIA_HELPER1$))))
+        goto L_Exit;
     if (BaseLevel < $@illia_min_level)
         goto L_HelperTooWeak1;
     set $@ILLIA_HELPER1$, strcharinfo(0);
     detachrid;
-    if (isloggedin($@ILLIA_HERO_ID) == 0)
-        goto L_Exit;
-    attachrid($@ILLIA_HERO_ID);
-    goto L_ChooseHelper2;
+    if (attachrid($@ILLIA_HERO_ID))
+        goto L_ChooseHelper2;
+    goto L_Exit;
 
 L_HelperTooWeak1:
     detachrid;
-    if (isloggedin($@ILLIA_HERO_ID) == 0)
+    if (!(attachrid($@ILLIA_HERO_ID)))
         goto L_Exit;
-    attachrid($@ILLIA_HERO_ID);
     mes "[Team Selector]";
     mes "The player " + $@ILLIA_HELPER1$ + " is too weak to help you.";
     next;
@@ -298,21 +297,20 @@ L_ChooseHelper2:
         goto L_WrongHelper2;
     if (isloggedin(getcharid(3, $@ILLIA_HELPER2$)) == 0)
         goto L_HelperDoesNotExist2;
-    attachrid(getcharid(3, $@ILLIA_HELPER2$));
+    if (!(attachrid(getcharid(3, $@ILLIA_HELPER2$))))
+        goto L_Exit;
     if (BaseLevel < $@illia_min_level)
         goto L_HelperTooWeak2;
     set $@ILLIA_HELPER2$, strcharinfo(0);
     detachrid;
-    if (isloggedin($@ILLIA_HERO_ID) == 0)
-        goto L_Exit;
-    attachrid($@ILLIA_HERO_ID);
-    goto L_ChooseHelper3;
+    if (attachrid($@ILLIA_HERO_ID))
+        goto L_ChooseHelper3;
+    goto L_Exit;
 
 L_HelperTooWeak2:
     detachrid;
-    if (isloggedin($@ILLIA_HERO_ID) == 0)
-        goto L_Exit;
-    attachrid($@ILLIA_HERO_ID);
+    if (!(attachrid($@ILLIA_HERO_ID)))
+        goto_Exit;
     mes "[Team Selector]";
     mes "The player " + $@ILLIA_HELPER2$ + " is too weak to help you.";
     next;
@@ -349,22 +347,21 @@ L_ChooseHelper3:
         goto L_WrongHelper3;
     if (isloggedin(getcharid(3, $@ILLIA_HELPER3$)) == 0)
         goto L_HelperDoesNotExist3;
-    attachrid(getcharid(3, $@ILLIA_HELPER3$));
+    if (!(attachrid(getcharid(3, $@ILLIA_HELPER3$))))
+        goto L_Exit;
     if (BaseLevel < $@illia_min_level)
         goto L_HelperTooWeak3;
     set $@ILLIA_HELPER3$, strcharinfo(0);
     detachrid;
-    if (isloggedin($@ILLIA_HERO_ID) == 0)
-        goto L_Exit;
-    attachrid($@ILLIA_HERO_ID);
+    if (!(attachrid($@ILLIA_HERO_ID)))
+        goto_Exit;
     mes $@ILLIA_HELPER1$ + ", " + $@ILLIA_HELPER2$ + " and " + $@ILLIA_HELPER3$ + " will be your three comrades.";
     close;
 
 L_HelperTooWeak3:
     detachrid;
-    if (isloggedin($@ILLIA_HERO_ID) == 0)
-        goto L_Exit;
-    attachrid($@ILLIA_HERO_ID);
+    if (!(attachrid($@ILLIA_HERO_ID)))
+        goto_Exit;
     mes "[Team Selector]";
     mes "The player " + $@ILLIA_HELPER3$ + " is too weak to help you.";
     next;