Merge remote-tracking branch 'upstream/master' into feature/core_merge_10_2025

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSession.h
#	src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_gothik.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_grobbulus.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
#	src/server/scripts/Northrend/Naxxramas/boss_sapphiron.cpp

deps/CMakeLists.txt

@@ -45,4 +45,5 @@ endif()
 if (BUILD_TOOLS_MAPS)
   add_subdirectory(bzip2)
   add_subdirectory(libmpq)
+  add_subdirectory(fkYAML)
 endif()

deps/PackageList.txt

@@ -81,3 +81,7 @@ recastnavigation (Recast is state of the art navigation mesh construction toolse
 {fmt} is an open-source formatting library providing a fast and safe alternative to C stdio and C++ iostreams.
   https://github.com/fmtlib/fmt
   Version: 7.1.3
+
+fkYAML (A C++ header-only YAML library)
+  https://github.com/fktn-k/fkYAML
+  Version: 721edb3e1a817e527fd9e1e18a3bea300822522e

deps/acore/joiner/joiner.sh

@@ -116,7 +116,21 @@ function Joiner:add_repo() (
     if [ -e "$path/.git/" ]; then
         # if exists , update
         echo "Updating $name on branch $branch..."
-        git --git-dir="$path/.git/" --work-tree="$path" rev-parse && git --git-dir="$path/.git/" --work-tree="$path" pull origin "$branch" | grep 'Already up-to-date.' && changed="no" || true
+        if ! git --git-dir="$path/.git/" --work-tree="$path" rev-parse >/dev/null 2>&1; then
+            echo "Unable to read repository at $path/.git/"
+            return $FALSE
+        fi
+
+        local pull_output
+        if ! pull_output=$(git --git-dir="$path/.git/" --work-tree="$path" pull origin "$branch" 2>&1); then
+            printf "%s\n" "$pull_output"
+            return $FALSE
+        fi
+
+        printf "%s\n" "$pull_output"
+        if echo "$pull_output" | grep -qE 'Already up[- ]to-date.'; then
+            changed="no"
+        fi
     else
         # otherwise clone
         echo "Cloning $name on branch $branch..."
@@ -440,4 +454,3 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
 else
     Joiner:_checkOptions $@
 fi
-

deps/fkYAML/CMakeLists.txt

@@ -0,0 +1,17 @@
+#
+# This file is part of the AzerothCore Project. See AUTHORS file for Copyright information
+#
+# This file is free software; as a special exception the author gives
+# unlimited permission to copy and/or distribute it, with or without
+# modifications, as long as this notice is preserved.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+#
+
+add_library(fkYAML INTERFACE)
+
+target_include_directories(fkYAML INTERFACE ${CMAKE_CURRENT_SOURCE_DIR})
+
+set_target_properties(fkYAML PROPERTIES FOLDER "deps")