From 131fd09f51ca8bbe518a1319a97c3dfa522280cf Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Thu, 7 Jan 2016 12:51:27 -0500 Subject: [PATCH] Players now have an empty UUID when a player not using steam joins the game while using the default uuid system. --- Release/Plugins/RenX.Core.lib | Bin 153594 -> 153594 bytes RenX.Core/RenX_Functions.cpp | 4 +++- RenX.Core/RenX_Server.cpp | 10 ++-------- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 5bdefac728da4370a4ed27f2f9e3923154a23e7d..5bc12718bdaefc53d205ddfc3ee58485958e01d8 100644 GIT binary patch delta 10662 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 O=-?!S|C5uP@c#p)o@&Ja delta 10662 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 No{0wkCnh>!{|8yvdjtRg diff --git a/RenX.Core/RenX_Functions.cpp b/RenX.Core/RenX_Functions.cpp index e03a6c5..af09fde 100644 --- a/RenX.Core/RenX_Functions.cpp +++ b/RenX.Core/RenX_Functions.cpp @@ -879,7 +879,9 @@ std::chrono::milliseconds RenX::getServerTime(const RenX::PlayerInfo *player) Jupiter::StringS RenX::default_uuid_func(RenX::PlayerInfo *player) { - return Jupiter::StringS::Format("0x%.16llX", player->steamid); + if (player->steamid != 0U) + return Jupiter::StringS::Format("0x%.16llX", player->steamid); + return Jupiter::StringS(); } double RenX::getKillDeathRatio(const RenX::PlayerInfo *player, bool includeSuicides) diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 945dde0..a1a276f 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -1376,10 +1376,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (steamid != 0) { player->steamid = steamid; - if (calc_uuid == RenX::default_uuid_func) - setUUID(player, this->formatSteamID(steamid)); - else - this->setUUIDIfDifferent(player, calc_uuid(player)); + this->setUUIDIfDifferent(player, calc_uuid(player)); } } @@ -1411,10 +1408,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) if (steamid != 0) { player->steamid = steamid; - if (calc_uuid == RenX::default_uuid_func) - setUUID(player, this->formatSteamID(steamid)); - else - this->setUUIDIfDifferent(player, calc_uuid(player)); + this->setUUIDIfDifferent(player, calc_uuid(player)); } }