Fix getAccountType crash - #3019 (#3453)

multitheftauto · Jun 9, 2024 · 0802e74 · 0802e74
1 parent d93287d
commit 0802e74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.cpp
@@ -118,7 +118,7 @@ int CLuaAccountDefs::GetAccountName(lua_State* luaVM)
     return 1;
 }
 
-std::optional<std::string> CLuaAccountDefs::GetAccountType(CAccount* pAccount)
+std::string CLuaAccountDefs::GetAccountType(CAccount* pAccount)
 {
     switch (pAccount->GetType())
     {
@@ -128,8 +128,9 @@ std::optional<std::string> CLuaAccountDefs::GetAccountType(CAccount* pAccount)
             return "console";
         case EAccountType::Player:
             return "player";
+        default:
+            return "unknown";
     }
-    return {};
 }
 
 int CLuaAccountDefs::GetAccountPlayer(lua_State* luaVM)

diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaAccountDefs.h
@@ -27,7 +27,7 @@ class CLuaAccountDefs : public CLuaDefs
     LUA_DECLARE(GetAccounts);
     LUA_DECLARE(GetAccountName);
 
-    static std::optional<std::string> GetAccountType(CAccount* pAccount);
+    static std::string GetAccountType(CAccount* pAccount);
 
     LUA_DECLARE(GetAccountPlayer);
     LUA_DECLARE(IsGuestAccount);