Merge 3.3.5 to 3.3.5-vas-autobalance

Author: Github Actions

cmake/compiler/clang/settings.cmake

@@ -129,11 +129,12 @@ endif()
 
 # -Wno-narrowing needed to suppress a warning in g3d
 # -Wno-deprecated-register is needed to suppress 185 gsoap warnings on Unix systems.
-# -Wno-deprecated-copy needed to suppress a warning in g3d
+# -Wno-undefined-inline needed for a compile time optimization hack with fmt
 target_compile_options(trinity-compile-option-interface
   INTERFACE
     -Wno-narrowing
-    -Wno-deprecated-register)
+    -Wno-deprecated-register
+    -Wno-undefined-inline)
 
 if(BUILD_SHARED_LIBS)
   # -fPIC is needed to allow static linking in shared libs.

contrib/extractor.sh

@@ -2,39 +2,39 @@
 
 # Set client and server directories as environment variables
 # if you don't want to enter them here
-if [ -z $CLIENT_DIR ]; then
+if [ -z "$CLIENT_DIR" ]; then
 echo -n "Enter directory where client files are located: "
 read CLIENT_DIR
 
-if ! cd $CLIENT_DIR; then
+if ! cd "$CLIENT_DIR"; then
         echo "Cannot access $CLIENT_DIR"
         exit 1
 fi
-if [ ! -d $CLIENT_DIR/Data ]; then
+if [ ! -d "$CLIENT_DIR/Data" ]; then
         echo "Cannot find client files in $CLIENT_DIR"
         exit 1
 fi
 fi
 
-if [ -z $SERVER_DIR ]; then
+if [ -z "$SERVER_DIR" ]; then
 echo -n "Enter directory where server files are located: "
 read SERVER_DIR
 
-if ! cd $SERVER_DIR; then
+if ! cd "$SERVER_DIR"; then
         echo "Cannot access $SERVER_DIR"
         exit 1
 fi
 fi
 
 # These should all be correct on a standard installation
-DATA_DIR=${SERVER_DIR}/data
-MAPEXTRACTOR=${SERVER_DIR}/bin/mapextractor
-VMAP4EXTRACTOR=${SERVER_DIR}/bin/vmap4extractor
-VMAP4ASSEMBLER=${SERVER_DIR}/bin/vmap4assembler
-MMAPS_GENERATOR=${SERVER_DIR}/bin/mmaps_generator
+DATA_DIR="${SERVER_DIR}/data"
+MAPEXTRACTOR="${SERVER_DIR}/bin/mapextractor"
+VMAP4EXTRACTOR="${SERVER_DIR}/bin/vmap4extractor"
+VMAP4ASSEMBLER="${SERVER_DIR}/bin/vmap4assembler"
+MMAPS_GENERATOR="${SERVER_DIR}/bin/mmaps_generator"
 
 check_files() {
-for i in $MAPEXTRACTOR $VMAP4EXTRACTOR $VMAP4ASSEMBLER $MMAPS_GENERATOR
+for i in "$MAPEXTRACTOR" "$VMAP4EXTRACTOR" "$VMAP4ASSEMBLER" "$MMAPS_GENERATOR"
 do
 	if [[ ! -x $i ]]
 	then
@@ -62,23 +62,23 @@ echo "Extracting DBC, Camera and Maps files"
 echo
 echo "-- Using $MAPEXTRACTOR"
 echo "-- Copying extracted data to ${DATA_DIR}"
-if [[ ! -d ${DATA_DIR} ]]
+if [[ ! -d "${DATA_DIR}" ]]
 then
 	echo "-- Creating ${DATA_DIR}"
-	mkdir ${DATA_DIR}
+	mkdir "${DATA_DIR}"
 fi
 echo "-- Starting in 5 seconds"
 sleep 5
 
-cd ${CLIENT_DIR}
-$MAPEXTRACTOR
+cd "${CLIENT_DIR}"
+"$MAPEXTRACTOR"
 
 echo "-- Extraction complete, copying dbc and maps files"
-cp -r dbc maps ${DATA_DIR}
-if [[ -d ${CLIENT_DIR}/Cameras ]]
+cp -r dbc maps "${DATA_DIR}"
+if [[ -d "${CLIENT_DIR}/Cameras" ]]
 then
 	echo "-- Camera files found, copying"
-	cp -r Cameras ${DATA_DIR}
+	cp -r Cameras "${DATA_DIR}"
 fi
 
 echo "-- Done"
@@ -95,13 +95,13 @@ echo "-- Copying extracted data to ${DATA_DIR}/vmaps"
 echo "-- Starting in 5 seconds"
 sleep 5
 
-cd ${CLIENT_DIR}
-$VMAP4EXTRACTOR
+cd "${CLIENT_DIR}"
+"$VMAP4EXTRACTOR"
 mkdir vmaps
-$VMAP4ASSEMBLER Buildings vmaps
+"$VMAP4ASSEMBLER" Buildings vmaps
 
 echo "-- Extraction complete, copying files"
-cp -r vmaps ${DATA_DIR}
+cp -r vmaps "${DATA_DIR}"
 echo "-- Done"
 echo
 }
@@ -115,11 +115,11 @@ echo "-- Copying extracted data to ${DATA_DIR}/mmaps"
 echo "-- Starting in 5 seconds"
 sleep 5
 
-cd ${CLIENT_DIR}
+cd "${CLIENT_DIR}"
 mkdir mmaps
-$MMAPS_GENERATOR
+"$MMAPS_GENERATOR"
 echo "-- Extraction complete, copying files"
-cp -r mmaps ${DATA_DIR}
+cp -r mmaps "${DATA_DIR}"
 echo "-- Done"
 echo
 }
@@ -135,7 +135,7 @@ echo "Enter y to continue or anything else to cancel"
 read a
 if [[ ${a} = "y" ]]
 then
-	cd ${CLIENT_DIR}
+	cd "${CLIENT_DIR}"
 	rm -fr Buildings Cameras dbc maps mmaps vmaps
 	echo "Done"
 fi

sql/updates/world/3.3.5/2026_02_16_00_world.sql

@@ -0,0 +1,12 @@
+--
+DELETE FROM `creature_formations` WHERE `leaderGUID` = 7483;
+INSERT INTO `creature_formations` (`leaderGUID`, `memberGUID`, `dist`, `angle`, `groupAI`, `point_1`, `point_2`) VALUES
+(7483,7483,0,0,3,0,0),
+(7483,81643,0,0,3,0,0),
+(7483,48348,0,0,3,0,0),
+(7483,81652,0,0,3,0,0),
+(7483,81651,0,0,3,0,0);
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_gruul_gronn_lords_grasp';
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(33572, 'spell_gruul_gronn_lords_grasp');

sql/updates/world/3.3.5/2026_02_17_00_world.sql

@@ -0,0 +1 @@
+UPDATE `quest_offer_reward` SET `RewardText`='Wintergarde is saved because of you, $n. To think that one $g man:woman; could so swiftly turn the tides of battle is hard for most to comprehend; yet here we are - victorious! You have managed to restore the faith of these people and earned the respect of your commanding officers.$B$B<Halford salutes.> $B$BLord Fordragon has returned to Angrathar to prepare our forces for the destruction of the Wrathgate and has requested that you join him! I couldn\'t recommend a better soldier for the job, $n.\n',`VerifiedBuild`=65893 WHERE `ID`=12473;

sql/updates/world/3.3.5/2026_02_17_01_world.sql

@@ -0,0 +1 @@
+UPDATE `quest_offer_reward` SET `Emote1`=4,`Emote2`=1,`Emote3`=66,`Emote4`=1 WHERE `ID`=12473;

sql/updates/world/3.3.5/2026_02_17_02_world.sql

@@ -0,0 +1,4 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=40969;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `Comment`) VALUES 
+(17, 0, 40969, 0, 0, 31, 1, 3, 23689, 0, 0, "Malister's Frost Wand only hits Proto-Drake");

sql/updates/world/3.3.5/2026_02_17_03_world.sql

@@ -0,0 +1,2 @@
+-- Changed restock value from 2.5 hours (9000) to 30 mins (1800)
+UPDATE `npc_vendor` SET `incrtime` = 1800 WHERE `entry` = 14860 AND `item` = 11027;

sql/updates/world/3.3.5/2026_02_17_04_world.sql

@@ -0,0 +1,2 @@
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 10928 AND `source_type` = 0;
+UPDATE `creature_template` SET `AIName` = '' WHERE `entry` = 10928;

sql/updates/world/3.3.5/2026_02_17_05_world.sql

@@ -0,0 +1,2 @@
+-- PrevQuestID 11239 to 11231, make Of Keys and Cages the prerequisite, not In Service to the Light
+UPDATE `quest_template_addon` SET `PrevQuestID` = 11231 WHERE `ID` = 11432;

sql/updates/world/3.3.5/2026_02_17_06_world.sql

@@ -0,0 +1,2 @@
+-- Remove Disarm Immunity
+UPDATE `creature_template` SET `mechanic_immune_mask` = `mechanic_immune_mask` & ~4 WHERE `entry` IN (31368, 29306);