From b58bab920c24e87b4cc5936959d6190c09bd13c2 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Sun, 22 Mar 2015 00:27:24 -0400 Subject: [PATCH] Fixed kick/ban bug --- Release/Plugins/RenX.Core.lib | Bin 110490 -> 110490 bytes RenX.Core/RenX_Server.cpp | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index da12ed0d24af0abc1af69352314684f74b827a4b..4244a6886307fa608bd100214ccb6ace19095250 100644 GIT binary patch delta 8443 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 delta 8443 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 diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index 2df3bc8..ab61ad2 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -304,7 +304,7 @@ Jupiter::StringS RenX::Server::formatSteamID(uint64_t id) const void RenX::Server::kickPlayer(int id) { - RenX::Server::sock.send(Jupiter::StringS::Format("cadminkick pid%d\n", id)); + RenX::Server::sock.send(Jupiter::StringS::Format(this->rconVersion >= 3 ? "ckick pid%d\n" : "cadminkick pid%d\n", id)); } void RenX::Server::kickPlayer(const RenX::PlayerInfo *player) @@ -327,7 +327,7 @@ void RenX::Server::kickPlayer(const RenX::PlayerInfo *player) void RenX::Server::banPlayer(int id) { if (RenX::Server::rconBan) - RenX::Server::sock.send(Jupiter::StringS::Format("cadminkickban pid%d\n", id)); + RenX::Server::sock.send(Jupiter::StringS::Format(this->rconVersion >= 3 ? "ckickban pid%d\n" : "cadminkickban pid%d\n", id)); else { RenX::PlayerInfo *player = RenX::Server::getPlayer(id);