1 files changed, 10 insertions, 1 deletions
diff --git a/npc/021-4/main.txt b/npc/021-4/main.txt
index a2bee72eb..9ea55fe5b 100644
--- a/npc/021-4/main.txt
+++ b/npc/021-4/main.txt
@@ -254,12 +254,21 @@ L_CleanUp:
 OnTimer2000:
     .@y=mobcount("021-4", "Cindy#Outside::OnPetDeath");
 
+    // Quest is complete... We might need to clean the mess.
+    if ($@CINDY_STATE > gettimetick(2)) {
+        .@pl = getmapusers("021-4");
+        if (!.@pl)
+            goto L_CleanUp;
+        end;
+    }
+
     // This finishes the quest
     if (.@y == 0 && .canfinish) {
         $@CINDY_STATE=gettimetick(2)+60*rand(55,65)*rand(4,36); // It is way too random to I say how long it takes (220min ~ 39 hours)
         mapannounce "021-4", "Nivalis: Cindy is now safe!",bc_all|bc_npc;
         areatimer "021-4", 20, 20, 100, 80, 10, "Cindy#Outside::OnReward";
-        goto L_CleanUp;
+        setnpcdisplay .name$, NPC_CINDY;
+        end;
     }
     .wtime+=2;