diff --git a/Game.Client/C_BasePlayer.cs b/Game.Client/C_BasePlayer.cs index 814b7e05..9d9e2350 100644 --- a/Game.Client/C_BasePlayer.cs +++ b/Game.Client/C_BasePlayer.cs @@ -96,15 +96,20 @@ public C_BasePlayer() { static EUniverse SteamIDUniverse = EUniverse.k_EUniverseInvalid; public bool GetSteamID(out CSteamID id) { id = default; - if (engine.GetPlayerInfo(EntIndex(), out PlayerInfo pi)) { - if (pi.FriendsID != 0 && SteamAPI.IsSteamRunning()) { - if (SteamIDUniverse == EUniverse.k_EUniverseInvalid) - SteamIDUniverse = SteamUtils.GetConnectedUniverse(); - id.InstancedSet(new AccountID_t(pi.FriendsID), 1, SteamIDUniverse, EAccountType.k_EAccountTypeIndividual); - return true; - } - } - return false; + if (!engine.GetPlayerInfo(EntIndex(), out PlayerInfo pi)) + return false; + + if (pi.FriendsID == 0 && !pi.FakePlayer) + return false; + + if (!SteamAPI.IsSteamRunning()) + return false; + + if (SteamIDUniverse == EUniverse.k_EUniverseInvalid) + SteamIDUniverse = SteamUtils.GetConnectedUniverse(); + + id.InstancedSet(new AccountID_t(pi.FriendsID), 1, SteamIDUniverse, pi.FakePlayer ? EAccountType.k_EAccountTypeAnonGameServer : EAccountType.k_EAccountTypeIndividual); + return true; } public int GetUserID() { if (!engine.GetPlayerInfo(EntIndex(), out PlayerInfo pi)) diff --git a/Game.Shared/GarrysMod/LuaPlayer.cs b/Game.Shared/GarrysMod/LuaPlayer.cs index c4686f71..5b8a0df5 100644 --- a/Game.Shared/GarrysMod/LuaPlayer.cs +++ b/Game.Shared/GarrysMod/LuaPlayer.cs @@ -123,7 +123,7 @@ static int Player__SteamID64(ILuaInterface lua) { static int Player__AccountID(ILuaInterface lua) { BasePlayer player = Get_Player(1, false)!; if (!player.GetSteamID(out Steamworks.CSteamID steamID)) { - lua.PushNumber(0); + lua.PushNumber(-1); return 1; } lua.PushNumber(steamID.GetAccountID().m_AccountID); diff --git a/Source.Engine/Server/BaseServer.cs b/Source.Engine/Server/BaseServer.cs index 3f1f4779..0305e564 100644 --- a/Source.Engine/Server/BaseServer.cs +++ b/Source.Engine/Server/BaseServer.cs @@ -1255,7 +1255,7 @@ protected virtual int GetChallengeType(NetAddress adr) { return Protocol.PROTOCOL_HASHEDCDKEY; #if !SWDS - if (Host.IsSinglePlayerGame() || !IsDedicated()) + if (Host.IsSinglePlayerGame() || (Steam3Client().SteamUser() == null && !IsDedicated())) return Protocol.PROTOCOL_HASHEDCDKEY; else #endif