From 0d9c3eacc2eefbd84dfe6c3e1781e4a3a874fdc9 Mon Sep 17 00:00:00 2001
From: Meow <30401521+me0wg4ming@users.noreply.github.com>
Date: Sun, 8 Mar 2026 07:06:50 +0100
Subject: [PATCH] fixed a rare lua error appearing when opening world map

---
 compat/vanilla.lua | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compat/vanilla.lua b/compat/vanilla.lua
index abc817a5..5135bdda 100644
--- a/compat/vanilla.lua
+++ b/compat/vanilla.lua
@@ -52,7 +52,8 @@ function hooksecurefunc(tbl, name, func, prepend)
     end
   else
     pfUI.hooks[tostring(func)]["function"] = function(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)
-      local r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16 = pfUI.hooks[tostring(func)]["old"](a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)
+      local ok, r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16 = pcall(pfUI.hooks[tostring(func)]["old"], a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)
+      if not ok then return end
       pfUI.hooks[tostring(func)]["new"](a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16)
       return r1, r2, r3, r4, r5, r6, r7, r8, r9, r10, r11, r12, r13, r14, r15, r16
     end
@@ -82,4 +83,4 @@ do -- RunMacroText
     obj.text = text
     ChatEdit_ParseText(obj, 1)
   end
-end
+end
\ No newline at end of file