From 1b0b189647f675431b67ff079287fb4450606f34 Mon Sep 17 00:00:00 2001
From: Vortrex <3858226+VortrexFTW@users.noreply.github.com>
Date: Sun, 25 Jul 2021 22:13:38 -0500
Subject: [PATCH] Add extra delay to config for force item action timeout

---
 scripts/server/config.js | 37 ++++++++++++++-----------------------
 1 file changed, 14 insertions(+), 23 deletions(-)

diff --git a/scripts/server/config.js b/scripts/server/config.js
index 0258e6e5..f2d49441 100644
--- a/scripts/server/config.js
+++ b/scripts/server/config.js
@@ -55,6 +55,7 @@ function loadGlobalConfig() {
 		itemActionStateReset: 5000,
 		subAccountNameAllowedCharacters: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz",
 		emailValidationRegex: /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/,
+		itemActionDelayExtraTimeout: 1000,
 	};
 }
 
@@ -209,21 +210,21 @@ function loadGameConfig() {
 			{},
 
 			{ // GTA 3
-				business: 0,
-				house: 0,
-				bank: 0,
-				clothes: 0,
-				info: 0,
-				job: 0,
+				business: 2,
+				house: 2,
+				bank: 2,
+				clothes: 2,
+				info: 2,
+				job: 2,
 			},
 
 			{ // GTA Vice City
-				business: 0,
-				house: 0,
-				bank: 0,
-				clothes: 0,
-				info: 0,
-				job: 0,
+				business: 2,
+				house: 2,
+				bank: 2,
+				clothes: 2,
+				info: 2,
+				job: 2,
 			},
 
 			{ // GTA San Andreas
@@ -1185,17 +1186,7 @@ function reloadServerConfigurationCommand(command, params, client) {
 // ===========================================================================
 
 function reloadEmailConfigurationCommand(command, params, client) {
-	emailConfig = loadEmailConfigFromGameAndPort(server.game, server.port);
-	applyConfigToServer(serverConfig);
-	updateServerRules();
-    messageAdminAction(`${getPlayerName(client)} reloaded the email configuration`);
-	return true;
-}
-
-// ===========================================================================
-
-function reloadEmailConfigurationCommand(command, params, client) {
-	emailConfig = loadEmailConfig();
+	emailConfig = loadEmailConfiguration();
     messageAdminAction(`${getPlayerName(client)} reloaded the email configuration`);
 	return true;
 }