Merge remote-tracking branch 'upstream/Playerbot' into Playerbot

Author: brighton-chi

apps/docker/Dockerfile

@@ -1,10 +1,12 @@
 ARG UBUNTU_VERSION=22.04 # lts
-ARG TZ=Etc/UTC
 
 # This target lays out the general directory skeleton for AzerothCore,
 # This target isn't intended to be directly used
 FROM ubuntu:$UBUNTU_VERSION AS skeleton
 
+# Note: ARG instructions defined after FROM are available in this build stage.
+# Placing ARG TZ here (after FROM) ensures it is accessible for configuring the timezone below.
+ARG TZ=Etc/UTC
 ARG DOCKER=1
 ARG DEBIAN_FRONTEND=noninteractive
 

apps/installer/includes/os_configs/windows.sh

@@ -24,7 +24,7 @@ fi
 
 choco install -y --skip-checksums $INSTALL_ARGS  cmake.install -y --installargs 'ADD_CMAKE_TO_PATH=System'
 choco install -y --skip-checksums $INSTALL_ARGS  visualstudio2022-workload-nativedesktop
-choco install -y --skip-checksums $INSTALL_ARGS  openssl --force --version=3.5.1
+choco install -y --skip-checksums $INSTALL_ARGS  openssl --force --version=3.5.2
 choco install -y --skip-checksums $INSTALL_ARGS  boost-msvc-14.3 --force --version=1.87.0
 choco install -y --skip-checksums $INSTALL_ARGS  mysql --force --version=8.4.4
 

apps/startup-scripts/src/simple-restarter

@@ -66,7 +66,7 @@ while true; do
     echo "$(basename "$BINARY") terminated after $DIFFERENCE seconds, restart count: $_restart_count"
 
     # Crash loop detection
-    if [ $DIFFERENCE -lt 10 ]; then
+    if [ "$DIFFERENCE" -lt 10 ]; then
         # Increment instant crash count if runtime is lower than 10 seconds
         ((_instant_crash_count++))
         echo "Warning: Quick restart detected ($DIFFERENCE seconds) - instant crash count: $_instant_crash_count"
@@ -76,11 +76,17 @@ while true; do
     fi
 
     # Prevent infinite crash loops
-    if [ $_instant_crash_count -gt 5 ]; then
+    if [ "$_instant_crash_count" -gt 5 ]; then
         echo "Error: $(basename "$BINARY") restarter exited. Infinite crash loop prevented (6 crashes in under 10 seconds each)"
         echo "Please check your system configuration and logs"
         exit 1
     fi
+
+    # Exit cleanly if shutdown was requested by command or SIGINT (exit code 0)
+    if [ "$_exit_code" -eq 0 ]; then
+        echo "$(basename "$BINARY") shutdown safely"
+        exit 0
+    fi
 
     echo "$(basename "$BINARY") will restart in 3 seconds..."
     sleep 3

data/sql/updates/db_world/2025_08_06_00.sql

@@ -0,0 +1,3 @@
+-- DB update 2025_08_01_01 -> 2025_08_06_00
+
+UPDATE `creature` SET `position_z` = 145.523 WHERE (`id1` = 26201) AND (`guid` IN (104059));

data/sql/updates/db_world/2025_08_06_01.sql

@@ -0,0 +1,16 @@
+-- DB update 2025_08_06_00 -> 2025_08_06_01
+
+-- Set flag Only Swim (sniffed flags)
+UPDATE `creature_template` SET `unit_flags` = `unit_flags`|32768 WHERE (`entry` = 25479);
+
+-- Remove Swim and Flight flags
+UPDATE `creature_template_movement` SET `Swim` = 0, `Flight` = 0 WHERE (`CreatureId` = 25479);
+
+-- Set SmartAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 25479;
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 25479);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(25479, 0, 0, 0, 0, 0, 100, 0, 2000, 3000, 9000, 11000, 0, 0, 11, 49816, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Kvaldir Mistweaver - In Combat - Cast \'Mist of Strangulation\''),
+(25479, 0, 1, 0, 4, 0, 100, 0, 0, 0, 0, 0, 0, 0, 60, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kvaldir Mistweaver - On Aggro - Set Fly Off'),
+(25479, 0, 2, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 0, 60, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Kvaldir Mistweaver - On Reset - Set Fly On');

data/sql/updates/db_world/2025_08_06_02.sql

@@ -0,0 +1,12 @@
+-- DB update 2025_08_06_01 -> 2025_08_06_02
+-- Captain Arathyn & Azurebeak
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 19635 AND `id` IN (5, 6, 7, 8));
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 21005 AND `id` IN (0, 1, 2, 5, 6, 7, 8));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(19635, 0, 5, 6, 0, 0, 100, 1, 500, 500, 0, 0, 0, 0, 64, 1, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Captain Arathyn - In Combat - Store Targetlist (No Repeat)'),
+(19635, 0, 6, 7, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 100, 1, 0, 0, 0, 0, 0, 204, 21005, 0, 0, 0, 0, 0, 0, 0, 'Captain Arathyn - In Combat - Send Target 1 (No Repeat)'),
+(19635, 0, 7, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 45, 1, 1, 0, 0, 0, 0, 204, 21005, 0, 0, 0, 0, 0, 0, 0, 'Captain Arathyn - In Combat - Set Data 1 1 to Azurebeak (No Repeat)'),
+(19635, 0, 8, 0, 25, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 204, 21005, 0, 0, 0, 0, 0, 0, 0, 'Captain Arathyn - On Reset - Despawn Summons'),
+(21005, 0, 0, 0, 0, 0, 100, 0, 9100, 9100, 11000, 14000, 0, 0, 11, 31273, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Azurebeak - In Combat - Cast \'Screech\''),
+(21005, 0, 1, 0, 38, 0, 100, 0, 1, 1, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 12, 1, 0, 0, 0, 0, 0, 0, 0, 'Azurebeak - On Data Set 1 1 - Start Attacking'),
+(21005, 0, 2, 0, 1, 0, 100, 0, 2000, 2000, 2000, 2000, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Azurebeak - Out of Combat - Despawn Instant');

data/sql/updates/db_world/2025_08_06_03.sql

@@ -0,0 +1,2 @@
+-- DB update 2025_08_06_02 -> 2025_08_06_03
+UPDATE `creature_template` SET `skinloot` = 0 WHERE (`entry` = 6582);

data/sql/updates/db_world/2025_08_06_04.sql

@@ -0,0 +1,28 @@
+-- DB update 2025_08_06_03 -> 2025_08_06_04
+
+-- Edit creature_text tables (Anok'ra, Sinrok, Tivax)
+DELETE FROM `creature_text` WHERE (`CreatureID` IN (26769, 26770, 26771));
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(26769, 0, 0, 'I gladly die for the master...', 12, 0, 100, 0, 0, 0, 25937, 0, ''),
+(26769, 0, 1, 'Your victory is meaningless.', 12, 0, 100, 0, 0, 0, 25938, 0, ''),
+(26769, 0, 3, 'Anub\'et\'kan will... end you.', 12, 0, 100, 0, 0, 0, 25936, 0, ''),
+(26769, 0, 4, 'I will rise again, more powerful... much... more...', 12, 0, 100, 0, 0, 0, 25939, 0, ''),
+(26770, 0, 0, 'I gladly die for the master...', 12, 0, 100, 0, 0, 0, 25937, 0, ''),
+(26770, 0, 1, 'Your victory is meaningless.', 12, 0, 100, 0, 0, 0, 25938, 0, ''),
+(26770, 0, 3, 'Anub\'et\'kan will... end you.', 12, 0, 100, 0, 0, 0, 25936, 0, ''),
+(26770, 0, 4, 'I will rise again, more powerful... much... more...', 12, 0, 100, 0, 0, 0, 25939, 0, ''),
+(26771, 0, 0, 'I gladly die for the master...', 12, 0, 100, 0, 0, 0, 25937, 0, ''),
+(26771, 0, 1, 'Your victory is meaningless.', 12, 0, 100, 0, 0, 0, 25938, 0, ''),
+(26771, 0, 3, 'Anub\'et\'kan will... end you.', 12, 0, 100, 0, 0, 0, 25936, 0, ''),
+(26771, 0, 4, 'I will rise again, more powerful... much... more...', 12, 0, 100, 0, 0, 0, 25939, 0, '');
+
+-- Add dialogue lines on Death (Anok'ra, Sinrok, Tivax)
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE (`entry` IN (26769, 26770, 26771));
+
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 26769) AND (`source_type` = 0) AND (`id` IN (12));
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 26770) AND (`source_type` = 0) AND (`id` IN (11));
+DELETE FROM `smart_scripts` WHERE (`entryorguid` = 26771) AND (`source_type` = 0) AND (`id` IN (2));
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(26769, 0, 12, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Anok\'ra the Manipulator - On Just Died - Say Line 0'),
+(26770, 0, 11, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Tivax the Breaker - On Just Died - Say Line 0'),
+(26771, 0, 2, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Sinok the Shadowrager - On Just Died - Say Line 0');

data/sql/updates/db_world/2025_08_07_00.sql

@@ -0,0 +1,6 @@
+-- DB update 2025_08_06_04 -> 2025_08_07_00
+
+-- Init creature_template_addon (Wastes Scavenger)
+DELETE FROM `creature_template_addon` WHERE (`entry` = 28005);
+INSERT INTO `creature_template_addon` (`entry`, `path_id`, `mount`, `bytes1`, `bytes2`, `emote`, `visibilityDistanceType`, `auras`) VALUES
+(28005, 0, 0, 0, 0, 438, 0, '');

data/sql/updates/db_world/2025_08_08_00.sql

@@ -0,0 +1,11 @@
+-- DB update 2025_08_07_00 -> 2025_08_08_00
+
+-- Edit SmartAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 26769;
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 26769);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(26769, 0, 0, 0, 9, 0, 100, 0, 3500, 5000, 3500, 5000, 0, 30, 11, 13860, 64, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Anok\'ra the Manipulator - Within 0-30 Range - Cast \'Mind Blast\''),
+(26769, 0, 1, 0, 9, 0, 100, 0, 1500, 3000, 8000, 11000, 0, 20, 11, 16568, 64, 0, 1, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Anok\'ra the Manipulator - Within 0-20 Range - Cast \'Mind Flay\''),
+(26769, 0, 2, 0, 0, 0, 100, 0, 6000, 9000, 17000, 20000, 0, 0, 11, 51676, 1, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 'Anok\'ra the Manipulator - In Combat - Cast \'Wavering Will\''),
+(26769, 0, 3, 0, 6, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Anok\'ra the Manipulator - On Just Died - Say Line 0');