From cbe28360df79c97f668dedb31981d8c1b65230a4 Mon Sep 17 00:00:00 2001
From: RaidMax <raidmax@live.com>
Date: Fri, 18 Feb 2022 10:15:11 -0600
Subject: [PATCH] validate game interface commands to ensure it's enabled
 before trying to execute

---
 .../IW4x/userraw/scripts/_integration.gsc     |  4 +-
 Plugins/ScriptPlugins/GameInterface.js        | 43 ++++++++++++++++++-
 2 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/GameFiles/IW4x/userraw/scripts/_integration.gsc b/GameFiles/IW4x/userraw/scripts/_integration.gsc
index 85d3893d..88db25b9 100644
--- a/GameFiles/IW4x/userraw/scripts/_integration.gsc
+++ b/GameFiles/IW4x/userraw/scripts/_integration.gsc
@@ -578,7 +578,7 @@ HideImpl()
         return;
     }
 
-    if ( self.isHidden )
+    if ( IsDefined( self.isHidden ) && self.isHidden )
     {
         self IPrintLnBold( "You are already hidden" );
         return;
@@ -682,7 +682,7 @@ NightModeImpl()
 
     foreach( player in level.players )
     {
-        self ToggleNightMode();
+        player ToggleNightMode();
     }
 }
 
diff --git a/Plugins/ScriptPlugins/GameInterface.js b/Plugins/ScriptPlugins/GameInterface.js
index d4b491aa..719bf9ba 100644
--- a/Plugins/ScriptPlugins/GameInterface.js
+++ b/Plugins/ScriptPlugins/GameInterface.js
@@ -92,6 +92,9 @@ let commands = [{
     }],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'GiveWeapon', gameEvent.Origin, gameEvent.Target, {weaponName: gameEvent.Data});
     }
 },
@@ -107,6 +110,9 @@ let commands = [{
     }],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'TakeWeapons', gameEvent.Origin, gameEvent.Target, undefined);
     }
 },
@@ -122,30 +128,39 @@ let commands = [{
     }],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'SwitchTeams', gameEvent.Origin, gameEvent.Target, undefined);
     }
 },
 {
     name: 'hide',
-    description: 'hide yourself',
+    description: 'hide yourself ingame',
     alias: 'hi',
     permission: 'SeniorAdmin',
     targetRequired: false,
     arguments: [],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'Hide', gameEvent.Origin, gameEvent.Origin, undefined);
     }
 },
 {
     name: 'unhide',
-    description: 'unhide yourself',
+    description: 'unhide yourself ingame',
     alias: 'unh',
     permission: 'SeniorAdmin',
     targetRequired: false,
     arguments: [],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'Unhide', gameEvent.Origin, gameEvent.Origin, undefined);
     }
 },
@@ -165,6 +180,9 @@ let commands = [{
         }],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'Alert', gameEvent.Origin, gameEvent.Target, {
             alertType: 'Alert',
             message: gameEvent.Data
@@ -183,6 +201,9 @@ let commands = [{
     }],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'Goto', gameEvent.Origin, gameEvent.Target, undefined);
     }
 },
@@ -206,6 +227,10 @@ let commands = [{
     }],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
+        
         const args = String(gameEvent.Data).split(' ');
         sendScriptCommand(gameEvent.Owner, 'Goto', gameEvent.Origin, gameEvent.Target, {
             x: args[0],
@@ -226,6 +251,9 @@ let commands = [{
     }],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'Kill', gameEvent.Origin, gameEvent.Target, undefined);
     }
 },
@@ -238,6 +266,9 @@ let commands = [{
     arguments: [],
     supportedGames: ['IW4'],
     execute: (gameEvent) => {
+        if (!validateEnabled(gameEvent.Owner, gameEvent.Origin)) {
+            return;
+        }
         sendScriptCommand(gameEvent.Owner, 'NightMode', gameEvent.Origin, undefined, undefined);
     }
 }];
@@ -471,3 +502,11 @@ const parseDataString = data => {
 
     return dict.length === 0 ? data : dict;
 }
+
+const validateEnabled = (server, origin) => {
+    const enabled = servers[server.EndPoint] != null && servers[server.EndPoint].enabled;
+    if (!enabled) {
+        origin.Tell("Game interface is not enabled on this server");
+    }
+    return enabled;
+}