Optimiziation + aHandleIp2cSetting() call order fix

Co-Authored-By: srslyyyy <51768772+srslyyyy@users.noreply.github.com>

Author: Fernando-A-Rocha

[admin]/admin/server/admin_server.lua

@@ -34,23 +34,42 @@ function notifyPlayerLoggedIn(player)
 end
 
 function aHandleIP2CUpdate()
-	local updateAdminPanel = {}
-	for id, player in ipairs(getElementsByType("player")) do
-		updatePlayerCountry ( player )
-		updateAdminPanel[#updateAdminPanel+1] = player
-	end
-	if #updateAdminPanel > 0 then
-		for id, player in ipairs(getElementsByType("player")) do
-			if ( hasObjectPermissionTo ( player, "general.adminpanel" ) ) then
-				for _, playerToUpdate in ipairs(updateAdminPanel) do
-					triggerClientEvent ( player, "aClientPlayerJoin", playerToUpdate, false, false, false, false, aPlayers[playerToUpdate]["country"] )
-				end
-			end
-		end
-	end
+    local playersToUpdate = false
+    local playersTable = getElementsByType("player") -- cache result, save function call
+
+    for playerID = 1, #playersTable do
+        local playerElement = playersTable[playerID]
+
+        if not playersToUpdate then
+            playersToUpdate = {} -- create table only when there are at least one player
+        end
+
+        updatePlayerCountry(playerElement)
+        playersToUpdate[#playersToUpdate + 1] = playerElement
+    end
+
+    if not playersToUpdate then
+        return -- if there are no players, stop further code execution
+    end
+
+    for playerID = 1, #playersTable do
+        local playerElement = playersTable[playerID]
+        local hasAdminPermission = hasObjectPermissionTo(playerElement, "general.adminpanel")
+
+        if hasAdminPermission then
+            
+            for playerToUpdateID = 1, #playersToUpdate do
+                local playerToUpdate = playersToUpdate[playerToUpdateID]
+
+                triggerClientEvent(playerElement, "aClientPlayerJoin", playerToUpdate,
+					false, false, false, false,
+					aPlayers[playerToUpdate]["country"]
+				)
+            end
+        end
+    end
 end
 
--- Starts resource if setting is true
 function aHandleIp2cSetting()
 	local enabled = get("*useip2c")
 	if enabled and enabled == "true" then
@@ -59,6 +78,11 @@ function aHandleIp2cSetting()
             -- Persistent
 			startResource(ip2c, true)
 		end
+	elseif (not enabled) or (enabled == "false") then
+		local ip2c = getResourceFromName("ip2c")
+		if ip2c and getResourceState(ip2c) == "running" then
+			stopResource(ip2c)
+		end
 	end
 end
 
@@ -75,7 +99,6 @@ addEventHandler ( "onResourceStart", root, function ( resource )
 		end
 		return
 	end
-	aHandleIp2cSetting()
 	_settings = xmlLoadFile ( "conf\\settings.xml" )
 	if ( not _settings ) then
 		_settings = xmlCreateFile ( "conf\\settings.xml", "main" )
@@ -89,6 +112,7 @@ addEventHandler ( "onResourceStart", root, function ( resource )
 			notifyPlayerLoggedIn(player)
 		end
 	end
+	aHandleIp2cSetting()
 	local node = xmlLoadFile ( "conf\\interiors.xml" )
 	if ( node ) then
 		local interiors = 0

[admin]/admin2/meta.xml

@@ -139,5 +139,11 @@
         friendlyname="Admin chat command name"
         desc="The command name for admin chat."
   />
+    <setting name="*useip2c" value="true"
+      friendlyname="useip2c"
+      group="_Advanced"
+      accept="true,false"
+      desc="Displays country flags next to players, set to false to save about 3MB of server RAM."
+      />
   </settings>
 </meta>

[admin]/admin2/server/admin_server.lua

@@ -17,23 +17,43 @@ aReports = {}
 aWeathers = {}
 
 function aHandleIP2CUpdate()
-	local updateAdminPanel = {}
-	for id, player in ipairs(getElementsByType("player")) do
-		updatePlayerCountry(player)
-		updateAdminPanel[#updateAdminPanel+1] = player
-	end
-	if #updateAdminPanel > 0 then
-		for id, player in ipairs(getElementsByType("player")) do
-			if ( hasObjectPermissionTo ( player, "general.adminpanel" ) ) then
-				for _, playerToUpdate in ipairs(updateAdminPanel) do
-					triggerClientEvent ( player, "aClientPlayerJoin", playerToUpdate, false, false, false, false, aPlayers[playerToUpdate].country, aPlayers[playerToUpdate].countryname )
-				end
-			end
-		end
-	end
+    local playersToUpdate = false
+    local playersTable = getElementsByType("player") -- cache result, save function call
+
+    for playerID = 1, #playersTable do
+        local playerElement = playersTable[playerID]
+
+        if not playersToUpdate then
+            playersToUpdate = {} -- create table only when there are at least one player
+        end
+
+        updatePlayerCountry(playerElement)
+        playersToUpdate[#playersToUpdate + 1] = playerElement
+    end
+
+    if not playersToUpdate then
+        return -- if there are no players, stop further code execution
+    end
+
+    for playerID = 1, #playersTable do
+        local playerElement = playersTable[playerID]
+        local hasAdminPermission = hasObjectPermissionTo(playerElement, "general.adminpanel")
+
+        if hasAdminPermission then
+            
+            for playerToUpdateID = 1, #playersToUpdate do
+                local playerToUpdate = playersToUpdate[playerToUpdateID]
+
+                triggerClientEvent(playerElement, "aClientPlayerJoin", playerToUpdate,
+                    false, false, false, false,
+                    aPlayers[playerToUpdate].country,
+                    aPlayers[playerToUpdate].countryname
+                )
+            end
+        end
+    end
 end
 
--- Starts resource if setting is true
 function aHandleIp2cSetting()
 	local enabled = get("*useip2c")
 	if enabled and enabled == "true" then
@@ -42,6 +62,11 @@ function aHandleIp2cSetting()
             -- Persistent
 			startResource(ip2c, true)
 		end
+	elseif (not enabled) or (enabled == "false") then
+		local ip2c = getResourceFromName("ip2c")
+		if ip2c and getResourceState(ip2c) == "running" then
+			stopResource(ip2c)
+		end
 	end
 end
 
@@ -62,14 +87,13 @@ addEventHandler(
             return
         end
 
-        aHandleIp2cSetting()
         aSetupACL()
         aSetupCommands()
         aSetupStorage()
-
         for id, player in ipairs(getElementsByType("player")) do
             aPlayerInitialize(player)
         end
+        aHandleIp2cSetting()
     end
 )