From c60a2c56ec01370b1a8444335fb3b3937ec68d42 Mon Sep 17 00:00:00 2001 From: ZioPao Date: Thu, 17 Apr 2025 12:54:50 +0200 Subject: [PATCH] fix: fixed (once and for all, hopefully) hotbar handling --- .../client/TOC/TimedActions/IgnoredActions.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/common/media/lua/client/TOC/TimedActions/IgnoredActions.lua b/common/media/lua/client/TOC/TimedActions/IgnoredActions.lua index a42d7af..509cd6a 100644 --- a/common/media/lua/client/TOC/TimedActions/IgnoredActions.lua +++ b/common/media/lua/client/TOC/TimedActions/IgnoredActions.lua @@ -15,7 +15,7 @@ local StaticData = require("TOC/StaticData") --- We're forced to re-run this crap to fix it ---@param action ISBaseTimedAction -local function OverrideAction(action, time) +local function OverrideAction(action, maxTime) -- TODO Add forced debuff instead of just relying on the vanilla values? action.skipTOC = true action.maxTime = time @@ -25,16 +25,16 @@ end local og_ISAttachItemHotbar_new = ISAttachItemHotbar.new function ISAttachItemHotbar:new(character, item, slot, slotIndex, slotDef) local action = og_ISAttachItemHotbar_new(self, character, item, slot, slotIndex, slotDef) - OverrideAction(action, -1) + OverrideAction(action, 30) -- Default time for this action return action end --- local og_ISDetachItemHotbar_new = ISDetachItemHotbar.new --- function ISDetachItemHotbar:new(character, item) --- local action = og_ISDetachItemHotbar_new(self, character, item) --- --action = OverrideAction(action, -1) --- return action --- end +local og_ISDetachItemHotbar_new = ISDetachItemHotbar.new +function ISDetachItemHotbar:new(character, item) + local action = og_ISDetachItemHotbar_new(self, character, item) + OverrideAction(action, 25) -- Default time for this action + return action +end local og_ISEquipWeaponAction_new = ISEquipWeaponAction.new