From bd532dc01320d3e0e30669dc4b6770834b47cbdd Mon Sep 17 00:00:00 2001 From: ZioPao Date: Sat, 31 Jan 2026 17:32:28 +0100 Subject: [PATCH] fix: relayed amputations --- 42/media/lua/client/TOC/ClientRelayCommands.lua | 2 +- 42/media/lua/server/TOC/ServerRelayCommands.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/42/media/lua/client/TOC/ClientRelayCommands.lua b/42/media/lua/client/TOC/ClientRelayCommands.lua index 4b4b736..f9bd020 100644 --- a/42/media/lua/client/TOC/ClientRelayCommands.lua +++ b/42/media/lua/client/TOC/ClientRelayCommands.lua @@ -12,7 +12,7 @@ local ClientRelayCommands = {} local function InitAmputationHandler(limbName, surgeonNum) -- TODO Pretty unclean - local surgeonPl = getSpecificPlayer(surgeonNum) + local surgeonPl = getSpecificPlayer(surgeonNum) -- fix broken, getOnlineID not working anymore local handler = AmputationHandler:new(limbName, surgeonPl) return handler end diff --git a/42/media/lua/server/TOC/ServerRelayCommands.lua b/42/media/lua/server/TOC/ServerRelayCommands.lua index 94f938f..e5c8629 100644 --- a/42/media/lua/server/TOC/ServerRelayCommands.lua +++ b/42/media/lua/server/TOC/ServerRelayCommands.lua @@ -21,7 +21,7 @@ end ---@param args relayExecuteAmputationActionParams function ServerRelayCommands.RelayExecuteAmputationAction(surgeonPl, args) local patientPl = getPlayerByOnlineID(args.patientNum) - local surgeonNum = surgeonPl:getOnlineID() + local surgeonNum = surgeonPl:getPlayerNum() ---@type receiveDamageDuringAmputationParams local params = {surgeonNum = surgeonNum, limbName = args.limbName, damagePlayer = true} @@ -43,7 +43,7 @@ end ---@param args relayForcedAmputationParams function ServerRelayCommands.RelayForcedAmputation(adminObj, args) local patientPl = getPlayerByOnlineID(args.patientNum) - local adminNum = adminObj:getOnlineID() + local adminNum = adminObj:getPlayerNum() ---@type receiveDamageDuringAmputationParams local ampParams = {surgeonNum = adminNum, limbName = args.limbName, damagePlayer = false} -- the only difference between relayExecuteAmputationAction and this is the damage