From 8d213e4d6e3a47609e9435dd09955ad37a74ea79 Mon Sep 17 00:00:00 2001
From: P0nk <ponkcode@gmail.com>
Date: Tue, 2 Aug 2022 16:31:15 +0200
Subject: [PATCH] Fix broken dojo scripts since introduction of MapId constants

---
 scripts/npc/2091005.js                                  | 4 ++--
 scripts/portal/dojang_up.js                             | 4 ++--
 src/main/java/scripting/npc/NPCScriptManager.java       | 4 ++--
 src/main/java/scripting/portal/PortalScriptManager.java | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/scripts/npc/2091005.js b/scripts/npc/2091005.js
index fe15d8afbc..c19010597f 100644
--- a/scripts/npc/2091005.js
+++ b/scripts/npc/2091005.js
@@ -70,8 +70,8 @@ function action(mode, type, selection) {
             if (isRestingSpot(cm.getPlayer().getMap().getId())) {
                 var text = "I'm surprised you made it this far! But it won't be easy from here on out. You still want the challenge?\r\n\r\n#b#L0#I want to continue#l\r\n#L1#I want to leave#l\r\n";
 
-                const GameConstants = Java.type('constants.game.GameConstants');
-                if (!GameConstants.isDojoPartyArea(cm.getPlayer().getMapId())) {
+                const MapId = Java.type('constants.id.MapId');
+                if (!MapId.isPartyDojo(cm.getPlayer().getMapId())) {
                     text += "#L2#I want to record my score up to this point#l";
                 }
                 cm.sendSimple(text);
diff --git a/scripts/portal/dojang_up.js b/scripts/portal/dojang_up.js
index 7217aec743..7c4538861b 100644
--- a/scripts/portal/dojang_up.js
+++ b/scripts/portal/dojang_up.js
@@ -32,8 +32,8 @@ function enter(pi) {
             pi.goDojoUp();
             pi.getPlayer().getMap().setReactorState();
             var stage = Math.floor(pi.getPlayer().getMapId() / 100) % 100;
-            const GameConstants = Java.type('constants.game.GameConstants');
-            if ((stage - (stage / 6) | 0) == pi.getPlayer().getVanquisherStage() && !GameConstants.isDojoPartyArea(pi.getPlayer().getMapId())) // we can also try 5 * stage / 6 | 0 + 1
+            const MapId = Java.type('constants.id.MapId');
+            if ((stage - (stage / 6) | 0) == pi.getPlayer().getVanquisherStage() && !MapId.isPartyDojo(pi.getPlayer().getMapId())) // we can also try 5 * stage / 6 | 0 + 1
             {
                 pi.getPlayer().setVanquisherKills(pi.getPlayer().getVanquisherKills() + 1);
             }
diff --git a/src/main/java/scripting/npc/NPCScriptManager.java b/src/main/java/scripting/npc/NPCScriptManager.java
index e8049d285c..4b096e713e 100644
--- a/src/main/java/scripting/npc/NPCScriptManager.java
+++ b/src/main/java/scripting/npc/NPCScriptManager.java
@@ -155,8 +155,8 @@ public class NPCScriptManager extends AbstractScriptManager {
                 c.sendPacket(PacketCreator.enableActions());
             }
             return true;
-        } catch (final Exception ute) {
-            log.error("Error starting NPC script: {}", npc);
+        } catch (Exception e) {
+            log.error("Error starting NPC script: {}", npc, e);
             dispose(c);
 
             return false;
diff --git a/src/main/java/scripting/portal/PortalScriptManager.java b/src/main/java/scripting/portal/PortalScriptManager.java
index 79a8c58c80..f147afc096 100644
--- a/src/main/java/scripting/portal/PortalScriptManager.java
+++ b/src/main/java/scripting/portal/PortalScriptManager.java
@@ -71,7 +71,7 @@ public class PortalScriptManager extends AbstractScriptManager {
                 return script.enter(new PortalPlayerInteraction(c, portal));
             }
         } catch (Exception e) {
-            log.warn("Portal script {}", portal.getScriptName(), e);
+            log.warn("Portal script error in: {}", portal.getScriptName(), e);
         }
         return false;
     }