Make requested changes

multitheftauto · Jan 10, 2025 · c0720ae · c0720ae
1 parent 867aee1
commit c0720ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.cpp
@@ -45,9 +45,14 @@ void CLuaTeamDefs::AddClass(lua_State* luaVM)
     lua_registerclass(luaVM, "Team", "Element");
 }
 
-CClientTeam* CLuaTeamDefs::GetTeamFromName(const std::string name) noexcept
+std::variant<CClientTeam*, bool> CLuaTeamDefs::GetTeamFromName(const std::string name) noexcept
 {
-    return m_pTeamManager->GetTeam(name.c_str());
+    CClientTeam* team = m_pTeamManager->GetTeam(name.c_str());
+
+    if (!team)
+        return false;
+
+    return team;
 }
 
 std::string CLuaTeamDefs::GetTeamName(CClientTeam* team) noexcept

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h b/Client/mods/deathmatch/logic/luadefs/CLuaTeamDefs.h
@@ -18,7 +18,7 @@ class CLuaTeamDefs : public CLuaDefs
     static void AddClass(lua_State* luaVM);
 
 private:
-    static CClientTeam* GetTeamFromName(const std::string name) noexcept;
+    static std::variant<CClientTeam*, bool> GetTeamFromName(const std::string name) noexcept;
     static std::string GetTeamName(CClientTeam* team) noexcept;
     static CLuaMultiReturn<std::uint8_t, std::uint8_t, std::uint8_t> GetTeamColor(CClientTeam* team) noexcept;
     static bool GetTeamFriendlyFire(CClientTeam* team) noexcept;