From 24a8f7b4267888463fca122c8f5fd16ccf6436f3 Mon Sep 17 00:00:00 2001 From: JAJames Date: Fri, 1 Jul 2016 18:18:36 -0400 Subject: [PATCH] Revised previous commit --- Release/Plugins/RenX.Core.lib | Bin 206992 -> 206992 bytes RenX.Core/RenX_Server.cpp | 3 +-- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 62c92a583898635610be0c5d1ecda4cd8d5e2daf..a4a8ee3ccbba2b12129941197a6d5bf9e78a88cd 100644 GIT binary patch delta 12748 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 diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index b2f6f95..c13e3a5 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -2874,12 +2874,11 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) { // Player | "as" | Type="moderator" / "administrator" RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(2)); - player->adminType.erase(); for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnAdminLogout(this, player); - player->adminType = Jupiter::ReferenceString::empty; + player->adminType.erase(); } else if (subHeader.equals("Granted;")) {