diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultHook.lua b/Barotrauma/BarotraumaShared/Lua/DefaultHook.lua index 01d2ffc5f..18a828fa2 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultHook.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultHook.lua @@ -1,28 +1,42 @@ Hook.HookMethod("Barotrauma.Item", "TryInteract", function (instance, p) - Hook.Call("itemInteract", instance, p.picker, p.ignoreRequiredItems, p.forceSelectKey, p.forceActionKey) + if Hook.Call("itemInteract", instance, p.picker, p.ignoreRequiredItems, p.forceSelectKey, p.forceActionKey) == true then + return false + end end, Hook.HookMethodType.Before) Hook.HookMethod("Barotrauma.Item", "ApplyTreatment", function (instance, p) - Hook.Call("itemApplyTreatment", instance, p.user, p.character, p.targetLimb) + if Hook.Call("itemApplyTreatment", instance, p.user, p.character, p.targetLimb) then + return false + end end, Hook.HookMethodType.Before) Hook.HookMethod("Barotrauma.Item", "Combine", function (instance, p) - Hook.Call("itemCombine", instance, p.item, p.user) + if Hook.Call("itemCombine", instance, p.item, p.user) == true then + return false + end end, Hook.HookMethodType.Before) Hook.HookMethod("Barotrauma.Item", "Drop", function (instance, p) - Hook.Call("itemDrop", instance, p.dropper) + if Hook.Call("itemDrop", instance, p.dropper) == true then + return false + end end, Hook.HookMethodType.Before) Hook.HookMethod("Barotrauma.Item", "Equip", function (instance, p) - Hook.Call("itemEquip", instance, p.character) + if Hook.Call("itemEquip", instance, p.character) == true then + return false + end end, Hook.HookMethodType.Before) Hook.HookMethod("Barotrauma.Item", "Unequip", function (instance, p) - Hook.Call("itemUnequip", instance, p.character) + if Hook.Call("itemUnequip", instance, p.character) == true then + return false + end end, Hook.HookMethodType.Before) Hook.HookMethod("Barotrauma.Networking.GameServer", "AssignJobs", function (instance, a) - Hook.Call("jobAssigned", a) + if Hook.Call("jobAssigned", a) == true then + return false + end end, Hook.HookMethodType.After) \ No newline at end of file diff --git a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua index 4f11fb270..0c0949ec9 100644 --- a/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua +++ b/Barotrauma/BarotraumaShared/Lua/DefaultRegister.lua @@ -105,8 +105,6 @@ RegisterBarotrauma("Items.Components.Repairable") RegisterBarotrauma("Items.Components.RepairTool") RegisterBarotrauma("Items.Components.NameTag") RegisterBarotrauma("Items.Components.LevelResource") -RegisterBarotrauma("Items.Components.NameTag") -RegisterBarotrauma("Items.Components.NameTag") RegisterBarotrauma("AIController") RegisterBarotrauma("EnemyAIController")