I should stop trying to fix stuff while I'm falling asleep

media/lua/client/TOC/Admin.lua

@@ -8,8 +8,7 @@ local DataController = require("TOC/Controllers/DataController")
 ---@param context ISContextMenu
 ---@param worldobjects table
 local function AddAdminTocOptions(playerNum, context, worldobjects)
-
+    if not(isClient() and isAdmin() or isDebugEnabled()) then return end
-    if (isClient() and not isDebugEnabled()) or isAdmin() then return end
 
     local players = {}
     for _, v in ipairs(worldobjects) do
@@ -72,6 +71,8 @@ local function AddAdminTocOptions(playerNum, context, worldobjects)
             end)
         end
     end
+
+    
 end
 Events.OnFillWorldObjectContextMenu.Add(AddAdminTocOptions)
 

media/lua/client/TOC/Controllers/LimitActionsController.lua

@@ -291,6 +291,12 @@ function ISWorldObjectContextMenu.createMenu(player, worldobjects, x, y, test)
     ---@type ISContextMenu
     local ogContext = og_ISWorldObjectContextMenu_createMenu(player, worldobjects, x, y, test)
 
+    -- goddamn it, zomboid devs. ogContext could be a boolean...
+    -- TBH, I don't really care about gamepad support, but all this method can break stuff. Let's just disable thisfor gamepad users.
+    if type(ogContext) == "boolean" or type(ogContext) == "string" then
+        return ogContext
+    end
+
 
     -- The vanilla game doesn't count an item in the off hand as "equipped" for picking up glass. Let's fix that here
     local brokenGlassOption = ogContext:getOptionFromName(getText("ContextMenu_RemoveBrokenGlass"))

media/lua/client/TOC/Main.lua

@@ -6,7 +6,7 @@ require("TOC/Events")
 
 ---@class Main
 local Main = {
-    _version = "2.1.3"
+    _version = "2.1.5"
 }
 
 function Main.Start()

mod.info

@@ -4,5 +4,5 @@ description=You've been bitten. You have only two choices.
 id=TheOnlyCure
 icon=icon.png
 url=https://github.com/ZioPao/The-Only-Cure
-modversion=2.1.3
+modversion=2.1.5
 pzversion=41.65