Merge 3.3.5 to 3.3.5-skip-dk

Author: Github Actions

sql/updates/world/3.3.5/2026_05_07_00_world.sql

@@ -0,0 +1,79 @@
+--
+SET @SPAWN_GROUP_ID := 357; -- 3
+
+-- Hellfire Sentry
+DELETE FROM `creature_text` WHERE `CreatureID` = 17517;
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(17517,0,0,"We are the true Horde!",12,0,100,0,0,0,16697,0,"Hellfire Sentry"),
+(17517,0,1,"For Kargath!  For Victory!",12,0,100,0,0,0,16698,0,"Hellfire Sentry"),
+(17517,0,2,"Gakarah ma!",12,0,100,0,0,0,16699,0,"Hellfire Sentry"),
+(17517,0,3,"The blood is our power! ",12,0,100,0,0,0,16700,0,"Hellfire Sentry"),
+(17517,0,4,"Lok'tar Illadari!\n",12,0,100,0,0,0,16701,0,"Hellfire Sentry"),
+(17517,0,5,"This world is OURS!",12,0,100,0,0,0,16702,0,"Hellfire Sentry"),
+(17517,0,6,"Lok narash!",12,0,100,0,0,0,16703,0,"Hellfire Sentry");
+
+UPDATE `creature_template` SET `AIName` = 'SmartAI', `ScriptName` = '' WHERE `entry` = 17517;
+DELETE FROM `smart_scripts` WHERE `entryorguid` = 17517 AND `source_type` = 0;
+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`,`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
+(17517,0,0,0,4,0,15,0,0,0,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,0,"Hellfire Sentry - On Aggro - Say Line 0"),
+(17517,0,1,0,0,0,100,0,5000,10000,20000,30000,0,11,30621,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Hellfire Sentry - In Combat - Cast 'Kidney Shot'");
+
+-- Vazruden the Herald
+UPDATE `creature_template` SET `speed_walk` = 4, `speed_run` = 2.57143 WHERE `entry` = 18435;
+
+UPDATE `creature` SET `spawntimesecs` = 86400 WHERE `id` = 17307;
+
+UPDATE `creature_template` SET `flags_extra` = `flags_extra` |512 WHERE `entry` IN (17307,18435);
+
+-- Nazan
+UPDATE `creature_template` SET `speed_walk` = 4, `speed_run` = 2.57143, `flags_extra` = `flags_extra` |512, `ScriptName` = '' WHERE `entry` IN (17536,18432);
+
+UPDATE `creature_model_info` SET `CombatReach` = 10 WHERE `DisplayID` = 18812;
+
+-- Vazruden
+UPDATE `creature_template` SET `speed_walk` = 1, `speed_run` = 1.42857, `BaseAttackTime` = 2400 WHERE `entry` = 18434;
+
+-- Misc
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 13 AND `SourceEntry` = 30693;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorType`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,30693,0,0,31,0,3,17536,0,0,0,0,"","Group 0: Spell 'Call Nazan' (Effect 0) targets creature 'Nazan'");
+
+DELETE FROM `spell_script_names` WHERE `ScriptName` IN (
+'spell_vazruden_call_nazan',
+'spell_vazruden_cone_of_fire',
+'spell_vazruden_fireball',
+'spell_vazruden_summon_vazruden');
+INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES
+(30693, 'spell_vazruden_call_nazan'),
+(30926, 'spell_vazruden_cone_of_fire'),
+(36921, 'spell_vazruden_cone_of_fire'),
+(30691, 'spell_vazruden_fireball'),
+(32491, 'spell_vazruden_fireball'),
+(33793, 'spell_vazruden_fireball'),
+(33794, 'spell_vazruden_fireball'),
+(34653, 'spell_vazruden_fireball'),
+(36920, 'spell_vazruden_fireball'),
+(30717, 'spell_vazruden_summon_vazruden');
+
+DELETE FROM `spelldifficulty_dbc` WHERE `id` IN (30926,34653);
+
+UPDATE `gameobject_template_addon` SET `faction` = 14 WHERE `entry` = 182533;
+
+UPDATE `gameobject_template` SET `ScriptName` = 'go_vazruden_liquid_fire' WHERE `entry` IN (180125,181890,182533);
+
+-- Spawn groups
+UPDATE `spawn_group` SET `groupId` = @SPAWN_GROUP_ID WHERE `spawnId` = 202693 AND `spawnType` = 0;
+UPDATE `spawn_group` SET `groupId` = @SPAWN_GROUP_ID WHERE `spawnId` = 202705 AND `spawnType` = 0;
+UPDATE `spawn_group` SET `groupId` = @SPAWN_GROUP_ID WHERE `spawnId` = 202706 AND `spawnType` = 0;
+
+DELETE FROM `spawn_group_template` WHERE `groupId` = 51;
+DELETE FROM `spawn_group_template` WHERE `groupId` = @SPAWN_GROUP_ID;
+INSERT INTO `spawn_group_template` (`groupId`, `groupName`, `groupFlags`) VALUES
+(@SPAWN_GROUP_ID+0,"Hellfire Ramparts - Vazruden the Herald",0);
+
+DELETE FROM `instance_spawn_groups` WHERE `instanceMapId` = 543 AND `bossStateId` = 3;
+DELETE FROM `instance_spawn_groups` WHERE `instanceMapId` = 543 AND `bossStateId` = 2 AND `spawnGroupId` = 51;
+DELETE FROM `instance_spawn_groups` WHERE `instanceMapId` = 543 AND `bossStateId` = 2 AND `spawnGroupId` = @SPAWN_GROUP_ID;
+
+INSERT INTO `instance_spawn_groups` (`instanceMapId`, `bossStateId`, `bossStates`, `spawnGroupId`, `flags`) VALUES
+(543,2,23,@SPAWN_GROUP_ID+0,1);

src/server/game/Battlegrounds/ArenaTeam.cpp

@@ -107,15 +107,13 @@ bool ArenaTeam::AddMember(ObjectGuid playerGuid)
         playerClass = player->GetClass();
         playerName = player->GetName();
     }
-    else
+    else if (CharacterCacheEntry const* characterInfo = sCharacterCache->GetCharacterCacheByGuid(playerGuid))
     {
-        CharacterCacheEntry const* cInfo = sCharacterCache->GetCharacterCacheByGuid(playerGuid);
-        if (!cInfo)
-            return false;
-
-        playerName = cInfo->Name;
-        playerClass = cInfo->Class;
+        playerName = characterInfo->Name;
+        playerClass = characterInfo->Class;
     }
+    else
+        return false;
 
     // Check if player is already in a similar arena team
     if ((player && player->GetArenaTeamId(GetSlot())) || sCharacterCache->GetCharacterArenaTeamIdByGuid(playerGuid, GetType()) != 0)

src/server/game/Entities/Item/Item.cpp

@@ -286,7 +286,7 @@ bool Item::Create(ObjectGuid::LowType guidlow, uint32 itemId, Player const* owne
     SetUInt32Value(ITEM_FIELD_DURABILITY, itemProto->MaxDurability);
 
     for (uint8 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
-        SetSpellCharges(i, itemProto->Spells[i].SpellCharges);
+        SetSpellCharges(i, itemProto->Effects[i].Charges);
 
     SetUInt32Value(ITEM_FIELD_DURATION, itemProto->Duration);
     SetUInt32Value(ITEM_FIELD_CREATE_PLAYED_TIME, 0);
@@ -454,7 +454,7 @@ bool Item::LoadFromDB(ObjectGuid::LowType guid, ObjectGuid owner_guid, Field* fi
             if (Optional<int32> charges = Trinity::StringTo<int32>(tokens[i]))
                 SetSpellCharges(i, *charges);
             else
-                TC_LOG_ERROR("entities.item", "Invalid charge info '{}' for item {}, charge data not loaded.", std::string(tokens[i]), GetGUID().ToString());
+                TC_LOG_ERROR("entities.item", "Invalid charge info '{}' for item {}, charge data not loaded.", tokens[i], GetGUID());
         }
     }
 

src/server/game/Entities/Item/ItemTemplate.cpp

@@ -147,9 +147,9 @@ void ItemTemplate::_LoadTotalAP()
             totalAP += ItemStat[i].ItemStatValue;
 
     // some items can have equip spells with +AP
-    for (uint32 i = 0; i < MAX_ITEM_PROTO_SPELLS; ++i)
-        if (Spells[i].SpellId > 0 && Spells[i].SpellTrigger == ITEM_SPELLTRIGGER_ON_EQUIP)
-            if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(Spells[i].SpellId))
+    for (ItemEffect const& itemEffect : Effects)
+        if (itemEffect.SpellID > 0 && itemEffect.TriggerType == ITEM_SPELLTRIGGER_ON_EQUIP)
+            if (SpellInfo const* spellInfo = sSpellMgr->GetSpellInfo(itemEffect.SpellID))
                 for (SpellEffectInfo const& effect : spellInfo->GetEffects())
                     if (effect.IsAura(SPELL_AURA_MOD_ATTACK_POWER))
                         totalAP += effect.CalcValue();
@@ -235,12 +235,12 @@ WorldPacket ItemTemplate::BuildQueryData(LocaleConstant loc) const
 
     for (uint8 s = 0; s < MAX_ITEM_PROTO_SPELLS; ++s)
     {
-        response.Stats.Spells[s].SpellId = Spells[s].SpellId;
-        response.Stats.Spells[s].SpellTrigger = Spells[s].SpellTrigger;
-        response.Stats.Spells[s].SpellCharges = Spells[s].SpellCharges;
-        response.Stats.Spells[s].SpellCooldown = Spells[s].SpellCooldown;
-        response.Stats.Spells[s].SpellCategory = Spells[s].SpellCategory;
-        response.Stats.Spells[s].SpellCategoryCooldown = Spells[s].SpellCategoryCooldown;
+        response.Stats.Spells[s].SpellId = Effects[s].SpellID;
+        response.Stats.Spells[s].SpellTrigger = Effects[s].TriggerType;
+        response.Stats.Spells[s].SpellCharges = Effects[s].Charges;
+        response.Stats.Spells[s].SpellCooldown = Effects[s].CoolDownMSec;
+        response.Stats.Spells[s].SpellCategory = Effects[s].SpellCategoryID;
+        response.Stats.Spells[s].SpellCategoryCooldown = Effects[s].CategoryCoolDownMSec;
     }
 
     response.Stats.Bonding = Bonding;

src/server/game/Entities/Item/ItemTemplate.h

@@ -574,15 +574,16 @@ struct _ItemStat
     uint32  ItemStatType = 0;
     int32   ItemStatValue = 0;
 };
-struct _Spell
+
+struct ItemEffect
 {
-    int32 SpellId = 0;                                      // id from Spell.dbc
-    uint32 SpellTrigger = 0;
-    int32  SpellCharges = 0;
+    int32  SpellID = 0;                                     // id from Spell.dbc
+    uint32 TriggerType = 0;
+    int32  Charges = 0;
     float  SpellPPMRate = 0.0f;
-    int32  SpellCooldown = -1;
-    uint32 SpellCategory = 0;                               // id from SpellCategory.dbc
-    int32  SpellCategoryCooldown = -1;
+    int32  CoolDownMSec = -1;
+    uint32 SpellCategoryID = 0;                             // id from SpellCategory.dbc
+    int32  CategoryCoolDownMSec = -1;
 };
 
 struct _Socket
@@ -644,7 +645,7 @@ struct TC_GAME_API ItemTemplate
     uint32 Delay;
     uint32 AmmoType;
     float  RangedModRange;
-    std::array<_Spell, MAX_ITEM_PROTO_SPELLS> Spells;
+    std::array<ItemEffect, MAX_ITEM_PROTO_SPELLS> Effects;
     uint32 Bonding;
     std::string  Description;
     uint32 PageText;