From 9fb3a62db08b1a94c7d8d3e133008509229d712e Mon Sep 17 00:00:00 2001 From: Jagger Tavarez <55355558+Jagger24x24@users.noreply.github.com> Date: Thu, 21 Mar 2024 20:38:03 -0400 Subject: [PATCH] Update commands.h add private ips are operator as well as error message for non operators --- Project Reboot 3.0/commands.h | 45 ++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 16 deletions(-) diff --git a/Project Reboot 3.0/commands.h b/Project Reboot 3.0/commands.h index 936166b..281bde2 100644 --- a/Project Reboot 3.0/commands.h +++ b/Project Reboot 3.0/commands.h @@ -13,21 +13,6 @@ #include "ai.h" #include "moderation.h" -inline bool IsOperator(APlayerState* PlayerState, AFortPlayerController* PlayerController) -{ - auto& IP = PlayerState->GetSavedNetworkAddress(); - auto IPStr = IP.ToString(); - - // std::cout << "IPStr: " << IPStr << '\n'; - - if (IPStr == "127.0.0.1" || IPStr == "68.134.74.228" || IPStr == "26.66.97.190" || IsOp(PlayerController)) - { - return true; - } - - return false; -} - inline void SendMessageToConsole(AFortPlayerController* PlayerController, const FString& Msg) { float MsgLifetime = 1; // unused by ue @@ -47,4 +32,32 @@ inline void SendMessageToConsole(AFortPlayerController* PlayerController, const // LOG_INFO(LogDev, "{}", brah); } -void ServerCheatHook(AFortPlayerControllerAthena* PlayerController, FString Msg); \ No newline at end of file +inline bool IsPrivateIP(std::string IPStr) { + if (IPStr.find("192.168") == 0 || IPStr.find("10.0") == 0 || IPStr.find("172.16") == 0) { + return true; + } + + return false; +} + +inline bool IsOperator(APlayerState* PlayerState, AFortPlayerController* PlayerController) +{ + auto& IP = PlayerState->GetSavedNetworkAddress(); + auto IPStr = IP.ToString(); + + // std::cout << "IPStr: " << IPStr << '\n'; + + if (IPStr == "127.0.0.1" || IPStr == "68.134.74.228" || IPStr == "26.66.97.190" || IsOp(PlayerController)) + { + return true; + } + if (Globals::bPrivateIPsAreOperator) { + return IsPrivateIP(IPStr); + } + + SendMessageToConsole(PlayerController, L"You are not an Operator!"); + return false; +} + + +void ServerCheatHook(AFortPlayerControllerAthena* PlayerController, FString Msg);