Merge branch 'master' into nitro

Author: Proxy-99

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<CTeam*> team) noexcept
 {
-    return CStaticFunctionDefinitions::SetPlayerTeam(player, team);
+    return CStaticFunctionDefinitions::SetPlayerTeam(player, team.value_or(nullptr));
 }
 
 bool CLuaTeamDefs::SetTeamName(CTeam* team, const std::string name)

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<CTeam*> 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;