From 60dd51440cd364454dac1ce5ef6197cca187d223 Mon Sep 17 00:00:00 2001
From: Marco <marcomoa@hotmail.com>
Date: Fri, 13 Dec 2024 15:19:25 -0300
Subject: [PATCH 1/2] fix: remove unsupported compiler flags for MSVC (#3173)

Resolves warnings issued during the Windows build
process with MSVC caused by unsupported compiler flags `(-march, -mtune,
-mno-avx, and -mno-sse4)`.
---
 CMakeLists.txt | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d7ba93bafb2..c24705e51e7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,9 +38,10 @@ endif()
 list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 
 # Configure build options for compatibility with commodity CPUs
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
-
+if(NOT MSVC)
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=x86-64 -mtune=generic -mno-avx -mno-sse4")
+endif()
 
 # *****************************************************************************
 # Include cmake tools

From 61c1fc08abb9e9fbfecf6bcfb464a09a8214e1a1 Mon Sep 17 00:00:00 2001
From: Eduardo Dantas <eduardo.dantas@hotmail.com.br>
Date: Sat, 14 Dec 2024 01:53:28 -0300
Subject: [PATCH 2/2] fix: infinite loop in Zone:randomPosition when no valid
 tile exist (#3178)

This commit fixes an infinite loop issue in the `Zone:randomPosition`
function. When no valid positions (walkable tiles) exist in the zone,
the function would previously enter an infinite loop. The updated logic
now filters all positions upfront to identify walkable tiles, and if
none are found, the function returns `nil` with appropriate logging.
This change ensures better error handling and prevents server freezes
due to infinite loops.
---
 data/libs/systems/zones.lua | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/data/libs/systems/zones.lua b/data/libs/systems/zones.lua
index 698a464fe87..a232a071f41 100644
--- a/data/libs/systems/zones.lua
+++ b/data/libs/systems/zones.lua
@@ -15,12 +15,24 @@ function Zone:randomPosition()
 		logger.error("Zone:randomPosition() - Zone {} has no positions", self:getName())
 		return nil
 	end
-	local destination = positions[math.random(1, #positions)]
-	local tile = destination:getTile()
-	while not tile or not tile:isWalkable(false, false, false, false, true) do
-		destination = positions[math.random(1, #positions)]
-		tile = destination:getTile()
+
+	local validPositions = {}
+	for _, position in ipairs(positions) do
+		local tile = position:getTile()
+		if tile and tile:isWalkable(false, false, false, false, true) then
+			table.insert(validPositions, position)
+		else
+			logger.debug("Zone:randomPosition() - Position {} is invalid (Tile: {}, Walkable: {})", position, tile or "nil", tile and tile:isWalkable(false, false, false, false, true) or "false")
+		end
 	end
+
+	if #validPositions == 0 then
+		logger.error("Zone:randomPosition() - No valid positions in Zone {}", self:getName())
+		return nil
+	end
+
+	local destination = validPositions[math.random(1, #validPositions)]
+	logger.debug("Zone:randomPosition() - Selected valid position: {}", destination)
 	return destination
 end