6 files changed, 9 insertions, 5 deletions
diff --git a/world/map/npc/029-1/aahna.txt b/world/map/npc/029-1/aahna.txt
index 92f7ff6b..453774a9 100644
--- a/world/map/npc/029-1/aahna.txt
+++ b/world/map/npc/029-1/aahna.txt
@@ -5,13 +5,9 @@
 {
     set @npc_distance, 3;
     callfunc "PCtoNPCRange";
-    goto L_Meet;
+    if(@npc_check) end;
 
-L_Meet:
     mes "[Aahna]";
     mes "\"Hello, What a lovely day for a stroll.\"";
-    goto L_Close;
-
-L_Close:
     close;
 }
diff --git a/world/map/npc/029-1/hasan.txt b/world/map/npc/029-1/hasan.txt
index eef3eb64..626c5570 100644
--- a/world/map/npc/029-1/hasan.txt
+++ b/world/map/npc/029-1/hasan.txt
@@ -9,6 +9,8 @@
 029-1,35,33,0|script|Scared Man|160
 {
     callfunc "PCtoNPCRange";
+    if(@npc_check) end;
+
     if (QL_BEGIN >= 13)
         goto L_TutDone;
     message strcharinfo(0), "He looks too afraid to say anything.";
@@ -24,6 +26,7 @@ L_End:
 029-1,33,33,0|script|Hasan|189,3,3
 {
     callfunc "PCtoNPCRange";
+    if(@npc_check) end;
     goto L_Main;
 
 L_Main:
diff --git a/world/map/npc/029-1/kaan.txt b/world/map/npc/029-1/kaan.txt
index 297849fa..1133744c 100644
--- a/world/map/npc/029-1/kaan.txt
+++ b/world/map/npc/029-1/kaan.txt
@@ -4,6 +4,7 @@
 029-1,46,95,0|script|Kaan|160
 {
     callfunc "PCtoNPCRange";
+    if(@npc_check) end;
 
     set @kaan_talked, (STARTAREA & $@SpokeToKaan);
     if (!(@kaan_talked)) goto L_Tanisha;
diff --git a/world/map/npc/029-1/liana.txt b/world/map/npc/029-1/liana.txt
index 4cde049b..e3ffe889 100644
--- a/world/map/npc/029-1/liana.txt
+++ b/world/map/npc/029-1/liana.txt
@@ -3,6 +3,7 @@
 029-1,62,96,0|script|Liana|205
 {
     callfunc "PCtoNPCRange";
+    if(@npc_check) end;
     goto L_Talk;
 
 L_Talk:
diff --git a/world/map/npc/029-1/valon.txt b/world/map/npc/029-1/valon.txt
index e7a276c8..20cbbcf8 100644
--- a/world/map/npc/029-1/valon.txt
+++ b/world/map/npc/029-1/valon.txt
@@ -65,6 +65,8 @@ OnInit:
 029-1,72,86,0|script|Valon|156
 {
     callfunc "PCtoNPCRange";
+    if(@npc_check) end;
+
     callfunc "ValonCount";
     if (QL_VALON >= 6)
         goto L_QuestComplete;
diff --git a/world/map/npc/029-1/zegas.txt b/world/map/npc/029-1/zegas.txt
index a350447d..b25bd6c9 100644
--- a/world/map/npc/029-1/zegas.txt
+++ b/world/map/npc/029-1/zegas.txt
@@ -5,6 +5,7 @@
 {
     set @npc_distance, 2;
     callfunc "PCtoNPCRange";
+    if(@npc_check) end;
 
     if (QL_ZEGAS == 1)
         goto L_Find;