3 files changed, 6 insertions, 1 deletions
diff --git a/world/map/npc/030-2/eljas.txt b/world/map/npc/030-2/eljas.txt
index 82bdb120..76f1204f 100644
--- a/world/map/npc/030-2/eljas.txt
+++ b/world/map/npc/030-2/eljas.txt
@@ -5,6 +5,7 @@
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
+    if(@getout) end;
     goto L_Start;
 
 L_Start:
@@ -201,6 +202,7 @@ L_End:
 OnTouch:
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
+    if(@getout) end;
     if((@xmas_list_gather) || !($@xmas_time))
         goto L_End;
     goto L_Start;
diff --git a/world/map/npc/030-2/guards.txt b/world/map/npc/030-2/guards.txt
index 54a17465..5ed2e2e9 100644
--- a/world/map/npc/030-2/guards.txt
+++ b/world/map/npc/030-2/guards.txt
@@ -4,6 +4,7 @@
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
+    if(@getout) end;
     mes "[Valjas]";
     mes "\"...\"";
     close;
@@ -13,6 +14,7 @@
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
+    if(@getout) end;
     mes "[Halas]";
     mes "\"...\"";
     close;
@@ -22,6 +24,7 @@
 {
     callfunc "XmasStates";
     callfunc "ThrowOutTheBum";
+    if(@getout) end;
     mes "[Kilis]";
     mes "\"...\"";
     close;
diff --git a/world/map/npc/030-2/shipping_helper.txt b/world/map/npc/030-2/shipping_helper.txt
index 7c588cb6..92277278 100644
--- a/world/map/npc/030-2/shipping_helper.txt
+++ b/world/map/npc/030-2/shipping_helper.txt
@@ -115,5 +115,5 @@ L_Close:
     mes "\"Ok, back to work you two, we have to make up lost time for your antics.\"";
     set @wrap$, "";
     set @present_name$, "";
-    close;
+    return;
 }