From 0c016dcb82aaa98cb2454cb335f244d23d724b67 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Sun, 12 Dec 2021 00:50:01 -0300
Subject: Change the other of some things to try to fix the bugs... (Needs
 instance reset)

---
 npc/080-1/final.txt       |  2 +-
 npc/080-3/cutscene.txt    |  7 +++++--
 npc/annuals/xmas/2021.txt | 16 +++++++++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/npc/080-1/final.txt b/npc/080-1/final.txt
index 5b092263..d72b0192 100644
--- a/npc/080-1/final.txt
+++ b/npc/080-1/final.txt
@@ -118,7 +118,7 @@ OnInit:
     'XMAS21CUTSCENE=false;
     'XMAS21ENDING=true;
     maptimer2(getmap(), 10, instance_npcname(.name$)+"::OnFin");
-    end;
+    goto OnFin;
 
 OnFin:
     // Originally not planned, but no time to finish
diff --git a/npc/080-3/cutscene.txt b/npc/080-3/cutscene.txt
index f4dc02f5..fae47f84 100644
--- a/npc/080-3/cutscene.txt
+++ b/npc/080-3/cutscene.txt
@@ -225,11 +225,14 @@ function ending {
     .stable += 1;
     maptimer2(getmap(), 10, instance_npcname(.name$)+"::OnFin");
     disablenpc instance_npcname(.name$);
-    close;
+    closeclientdialog;
+    goto OnFin;
 }
 
 OnFin:
-    X21ED1_DOCLEAR();
+    if (!X21ED1_CLEAR()) {
+        X21ED1_DOCLEAR();
+    }
     end;
 
 OnInit:
diff --git a/npc/annuals/xmas/2021.txt b/npc/annuals/xmas/2021.txt
index 58d50ff1..d0bd59c6 100644
--- a/npc/annuals/xmas/2021.txt
+++ b/npc/annuals/xmas/2021.txt
@@ -168,11 +168,8 @@ function	script	X21INIT	{
 		instance_set_timeout(getarg(0, 1800), getarg(0, 1800), .@inst);
 		instance_init(.@inst);
 
-        /* Create locks */
-        setcells .@mapa$, 103, 211, 107, 212, 1, "X21L1@"+X21ID();
-        setcells .@mapa$, 124, 127, 131, 128, 1, "X21L2@"+X21ID();
-        setcells .@mapa$,  47,  71,  51,  72, 1, "X21L3@"+X21ID();
-        setcells .@mapd$,  81, 131,  86, 135, 1, "X21LF@"+X21ID();
+        /* Ensure the instance is up and running without fail */
+        sleep2(50);
 
         /* Spawn Special Monsters */
         "#XMAS21Core"::spawn(Grinchboo, 5, .@mapa$);
@@ -290,6 +287,15 @@ function	script	X21INIT	{
         }
         freeloop(false);
 
+        // We had some problems with the locks, so give it a tiny while of time
+        sleep2(50);
+
+        /* Create locks */
+        setcells .@mapa$, 103, 211, 107, 212, 1, "X21L1@"+X21ID();
+        setcells .@mapa$, 124, 127, 131, 128, 1, "X21L2@"+X21ID();
+        setcells .@mapa$,  47,  71,  51,  72, 1, "X21L3@"+X21ID();
+        setcells .@mapd$,  81, 131,  86, 135, 1, "X21LF@"+X21ID();
+
     }
     if (instance_id() >= 0)
 		instance_set_timeout(getarg(0, 1800), getarg(0, 1800));
-- 
cgit v1.2.3-60-g2f50