From a01d26819543fe20979700ebd53575b04ad3c3c0 Mon Sep 17 00:00:00 2001 From: Nico <122193236+Nico8340@users.noreply.github.com> Date: Thu, 16 Jan 2025 01:53:50 +0100 Subject: [PATCH 1/2] Update CLuaTeamDefs.h --- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h index 7b6c6f21c2c..985cc4576ec 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h @@ -30,7 +30,7 @@ class CLuaTeamDefs : public CLuaDefs static std::uint32_t CountPlayersInTeam(CTeam* team) noexcept; // Team set funcs - static bool SetPlayerTeam(CPlayer* player, CTeam* team) noexcept; + static bool SetPlayerTeam(CPlayer* player, std::optional team) noexcept; static bool SetTeamName(CTeam* team, const std::string name); static bool SetTeamColor(CTeam* team, const std::uint8_t red, const std::uint8_t green, const std::uint8_t blue) noexcept; static bool SetTeamFriendlyFire(CTeam* team, const bool state) noexcept; From d0dc58210565716d96ab881a6de23d04cde2588d Mon Sep 17 00:00:00 2001 From: Nico <122193236+Nico8340@users.noreply.github.com> Date: Thu, 16 Jan 2025 01:53:52 +0100 Subject: [PATCH 2/2] Update CLuaTeamDefs.cpp --- Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp index df445b5a2b7..65c3fad3766 100644 --- a/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp +++ b/Server/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp @@ -127,9 +127,9 @@ std::uint32_t CLuaTeamDefs::CountPlayersInTeam(CTeam* team) noexcept return team->CountPlayers(); } -bool CLuaTeamDefs::SetPlayerTeam(CPlayer* player, CTeam* team) noexcept +bool CLuaTeamDefs::SetPlayerTeam(CPlayer* player, std::optional team) noexcept { - return CStaticFunctionDefinitions::SetPlayerTeam(player, team); + return CStaticFunctionDefinitions::SetPlayerTeam(player, team.value_or(nullptr)); } bool CLuaTeamDefs::SetTeamName(CTeam* team, const std::string name)