From 4ee258770d10176aaa0f84f6490eef1221bda9b4 Mon Sep 17 00:00:00 2001 From: JAJames Date: Tue, 8 Mar 2016 21:34:36 -0500 Subject: [PATCH] Fixed some offsets --- Release/Plugins/RenX.Core.lib | Bin 198102 -> 198102 bytes RenX.Core/RenX_Server.cpp | 14 +++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 0f256889182b0737451eb9fea3901f3b7109a7e2..acae2dff4b096bf6e9c316fd4336490aa36af54e 100644 GIT binary patch delta 12578 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 delta 12578 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 diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index aab3891..d69a0d3 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -2241,8 +2241,8 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) else if (subHeader.equals("OverMine;")) { // Player | "near" | Location - RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(1)); - Jupiter::ReferenceString location = tokens.getToken(3); + RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(2)); + Jupiter::ReferenceString location = tokens.getToken(4); for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnOverMine(this, player, location); @@ -2438,9 +2438,9 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) // Player | Rank if (this->devBot == false) { - RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(1)); + RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(2)); if (player != nullptr) - player->global_rank = tokens.getToken(2).asUnsignedInt(); + player->global_rank = tokens.getToken(3).asUnsignedInt(); for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnRank(this, player); @@ -2449,9 +2449,9 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) else if (subHeader.equals("Dev;")) { // Player | true/false - RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(1)); + RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(2)); if (player != nullptr) - player->is_dev = tokens.getToken(2).asBool(); + player->is_dev = tokens.getToken(3).asBool(); for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnDev(this, player); @@ -2459,7 +2459,7 @@ void RenX::Server::processLine(const Jupiter::ReadableString &line) else if (subHeader.equals("SpeedHack;")) { // Player - RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(1)); + RenX::PlayerInfo *player = parseGetPlayerOrAdd(tokens.getToken(2)); for (size_t i = 0; i < xPlugins.size(); i++) xPlugins.get(i)->RenX_OnSpeedHack(this, player); }