Merge AzerothCore 3.3.5 to ElunaAzerothcore [skip ci]

github-actions[bot] · github-actions[bot] · commit 8c3f15cbd154 · 2026-02-04T01:56:12.000Z
diff --git a/data/sql/updates/db_world/2026_02_03_00.sql b/data/sql/updates/db_world/2026_02_03_00.sql
@@ -0,0 +1,7 @@
+-- DB update 2026_02_02_01 -> 2026_02_03_00
+-- Add parent rotation columns to gameobject_addon table for transport rotation support
+ALTER TABLE `gameobject_addon`
+  ADD COLUMN `parent_rotation0` FLOAT NOT NULL DEFAULT 0 AFTER `guid`,
+  ADD COLUMN `parent_rotation1` FLOAT NOT NULL DEFAULT 0 AFTER `parent_rotation0`,
+  ADD COLUMN `parent_rotation2` FLOAT NOT NULL DEFAULT 0 AFTER `parent_rotation1`,
+  ADD COLUMN `parent_rotation3` FLOAT NOT NULL DEFAULT 1 AFTER `parent_rotation2`;
diff --git a/data/sql/updates/db_world/2026_02_03_01.sql b/data/sql/updates/db_world/2026_02_03_01.sql
@@ -0,0 +1,6 @@
+-- DB update 2026_02_03_00 -> 2026_02_03_01
+-- DB/Gameobject: Update "Dangerous!" sign with sniffed values
+-- Closes https://github.com/azerothcore/azerothcore-wotlk/issues/16834
+DELETE FROM `gameobject` WHERE `guid` = 17154 AND `id` = 2008;
+INSERT INTO `gameobject` (`guid`, `id`, `map`, `zoneId`, `areaId`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`, `VerifiedBuild`) VALUES
+(17154, 2008, 0, 267, 272, 1, 1, -19.4826393127441406, -935.3038330078125, 58.09708786010742187, 2.65289926528930664, -0.04655265808105468, 0.011606216430664062, 0.969178199768066406, 0.241643846035003662, 120, 255, 1, 42328);
diff --git a/data/sql/updates/db_world/2026_02_04_00.sql b/data/sql/updates/db_world/2026_02_04_00.sql
@@ -0,0 +1,9 @@
+-- DB update 2026_02_03_01 -> 2026_02_04_00
+--
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20046);
+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
+(20046, 0, 0, 0, 0, 0, 100, 0, 1000, 3000, 5500, 7500, 0, 0, 11, 37110, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Astromancer Lord - In Combat - Cast \'Fire Blast\''),
+(20046, 0, 1, 0, 0, 0, 100, 0, 4000, 8000, 15000, 17000, 0, 0, 11, 37289, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Astromancer Lord - In Combat - Cast \'Dragon\'s Breath\''),
+(20046, 0, 2, 0, 0, 0, 100, 0, 15000, 16000, 15000, 24000, 0, 0, 11, 37109, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Astromancer Lord - In Combat - Cast \'Fireball Volley\''),
+(20046, 0, 3, 0, 0, 0, 100, 1, 0, 1000, 0, 0, 0, 0, 11, 38732, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Astromancer Lord - In Combat - Cast \'Fire Shield\' (No Repeat)'),
+(20046, 0, 4, 0, 0, 0, 100, 0, 9700, 19800, 10900, 23800, 0, 0, 11, 37122, 32, 0, 0, 0, 0, 6, 20, 1, 0, 37122, 0, 0, 0, 0, 'Astromancer Lord - In Combat - Cast \'Domination\'');
diff --git a/data/sql/updates/db_world/2026_02_04_01.sql b/data/sql/updates/db_world/2026_02_04_01.sql
@@ -0,0 +1,37 @@
+-- DB update 2026_02_04_00 -> 2026_02_04_01
+--
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 19734);
+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
+(19734, 0, 0, 1, 0, 0, 100, 1, 8000, 12000, 0, 0, 0, 0, 11, 35256, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fungal Giant - In Combat - Cast \'Serverside - Summon Unstable Mushroom\' (No Repeat)'),
+(19734, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 'Fungal Giant - In Combat - Say Line 0 (No Repeat)');
+
+DELETE FROM `creature_text` WHERE (`CreatureID` = 19734);
+INSERT INTO `creature_text` (`CreatureID`, `GroupID`, `ID`, `Text`, `Type`, `Language`, `Probability`, `Emote`, `Duration`, `Sound`, `BroadcastTextId`, `TextRange`, `comment`) VALUES
+(19734, 0, 0, '%s throws a mushroom spore at $n.', 16, 0, 100, 0, 0, 0, 18913, 0, 'Fungal Giant Unstable Shroom');
+
+DELETE FROM `creature_template_movement` WHERE (`CreatureId` = 20479);
+INSERT INTO `creature_template_movement` (`CreatureId`, `Ground`, `Swim`, `Flight`, `Rooted`, `Chase`, `Random`, `InteractionPauseTimer`) VALUES
+(20479, 0, 0, 0, 1, 0, 0, 0);
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 20479);
+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
+(20479, 0, 0, 0, 54, 0, 100, 0, 0, 0, 0, 0, 0, 0, 80, 2047900, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - On Just Summoned - Run Script');
+
+DELETE FROM `smart_scripts` WHERE (`source_type` = 9 AND `entryorguid` = 2047900);
+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
+(2047900, 9, 0 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 8, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Set Reactstate Passive'),
+(2047900, 9, 1 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 11, 31690, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Putrid Mushroom\''),
+(2047900, 9, 2 , 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 11, 31691, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Shrink\''),
+(2047900, 9, 3 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 4 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 5 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 6 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 7 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 8 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 9 , 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 10, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 11, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Grow\''),
+(2047900, 9, 12, 0, 0, 0, 100, 0, 2000, 2000, 0, 0, 0, 0, 11, 35362, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Unstable Mushroom Visual\''),
+(2047900, 9, 13, 0, 0, 0, 100, 0, 0, 0, 0, 0, 0, 0, 11, 35252, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Cast \'Unstable Cloud\''),
+(2047900, 9, 14, 0, 0, 0, 100, 0, 1000, 1000, 0, 0, 0, 0, 28, 31698, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Remove Aura \'Grow\''),
+(2047900, 9, 15, 0, 0, 0, 100, 0, 3000, 3000, 0, 0, 0, 0, 41, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Unstable Shroom - Actionlist - Despawn Instant');
diff --git a/data/sql/updates/db_world/2026_02_04_02.sql b/data/sql/updates/db_world/2026_02_04_02.sql
@@ -0,0 +1,3 @@
+-- DB update 2026_02_04_01 -> 2026_02_04_02
+-- Removes "Warsong Report" and "Battered Junkbox" (yes remove itself from itself) from "Battered Junkbox"
+DELETE FROM `item_loot_template` WHERE `Entry` = 16882 AND `Item` IN (16746, 16882);
diff --git a/data/sql/updates/db_world/2026_02_04_03.sql b/data/sql/updates/db_world/2026_02_04_03.sql
@@ -0,0 +1,19 @@
+-- DB update 2026_02_04_02 -> 2026_02_04_03
+DELETE FROM `creature_template_model` WHERE `CreatureID` IN (17168, 17169, 17170, 17171, 17172, 17173, 17174, 17175, 17176, 25739);
+INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES
+(17168, 0, 15435, 1, 1, 51831),
+(17168, 1, 1126,  1, 0, 51831),
+(17169, 0, 15435, 1, 1, 51831),
+(17169, 1, 1126,  1, 0, 51831),
+(17170, 0, 15435, 1, 1, 51831),
+(17170, 1, 1126,  1, 0, 51831),
+(17171, 0, 15435, 1, 1, 51831),
+(17171, 1, 1126,  1, 0, 51831),
+(17172, 0, 15435, 1, 1, 51831),
+(17172, 1, 1126,  1, 0, 51831),
+(17173, 0, 15435, 1, 1, 51831),
+(17174, 0, 15435, 1, 1, 51831),
+(17175, 0, 15435, 1, 0, 51831),
+(17176, 0, 15435, 1, 0, 51831),
+(25739, 0, 169,   1, 0, 51831),
+(25739, 1, 23343, 1, 1, 51831);
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -41,6 +41,11 @@
 #include "LuaEngine.h"
 #endif
 
+bool QuaternionData::IsUnit() const
+{
+    return fabs(x * x + y * y + z * z + w * w - 1.0f) < 1e-5f;
+}
+
 GameObject::GameObject() : WorldObject(), MovableMapObject(),
     m_model(nullptr), m_goValue(), m_AI(nullptr)
 {
@@ -296,35 +301,14 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
         return false;
     }
 
-    GameObjectAddon const* addon = sObjectMgr->GetGameObjectAddon(GetSpawnId());
+    SetLocalRotation(rotation);
 
-    // hackfix for the hackfix down below
-    switch (goinfo->entry)
-    {
-        // excluded ids from the hackfix below
-        // used switch since there should be more
-        case 181233: // maexxna portal effect
-        case 181575: // maexxna portal
-        case 20992: // theramore black shield
-        case 21042: // theramore guard badge
-            SetLocalRotation(rotation);
-            break;
-        default:
-            // xinef: hackfix - but make it possible to use original WorldRotation (using special gameobject addon data)
-            // pussywizard: temporarily calculate WorldRotation from orientation, do so until values in db are correct
-            if (addon && addon->invisibilityType == INVISIBILITY_GENERAL && addon->InvisibilityValue == 0)
-            {
-                SetLocalRotation(rotation);
-            }
-            else
-            {
-                SetLocalRotationAngles(NormalizeOrientation(GetOrientation()), 0.0f, 0.0f);
-            }
-            break;
-    }
+    GameObjectAddon const* gameObjectAddon = sObjectMgr->GetGameObjectAddon(GetSpawnId());
+    QuaternionData parentRotation;
+    if (gameObjectAddon)
+        parentRotation = gameObjectAddon->ParentRotation;
 
-    // pussywizard: no PathRotation for normal gameobjects
-    SetTransportPathRotation(0.0f, 0.0f, 0.0f, 1.0f);
+    SetTransportPathRotation(parentRotation.x, parentRotation.y, parentRotation.z, parentRotation.w);
 
     SetObjectScale(goinfo->size);
 
@@ -406,12 +390,12 @@ bool GameObject::Create(ObjectGuid::LowType guidlow, uint32 name_id, Map* map, u
             break;
     }
 
-    if (addon)
+    if (gameObjectAddon)
     {
-        if (addon->InvisibilityValue)
+        if (gameObjectAddon->InvisibilityValue)
         {
-            m_invisibility.AddFlag(addon->invisibilityType);
-            m_invisibility.AddValue(addon->invisibilityType, addon->InvisibilityValue);
+            m_invisibility.AddFlag(gameObjectAddon->invisibilityType);
+            m_invisibility.AddValue(gameObjectAddon->invisibilityType, gameObjectAddon->InvisibilityValue);
         }
     }
 
diff --git a/src/server/game/Entities/GameObject/GameObjectData.h b/src/server/game/Entities/GameObject/GameObjectData.h
@@ -678,9 +678,23 @@ struct GameObjectLocale
     std::vector<std::string> CastBarCaption;
 };
 
+struct AC_GAME_API QuaternionData
+{
+    float x;
+    float y;
+    float z;
+    float w;
+
+    QuaternionData() : x(0.0f), y(0.0f), z(0.0f), w(1.0f) { }
+    QuaternionData(float X, float Y, float Z, float W) : x(X), y(Y), z(Z), w(W) { }
+
+    [[nodiscard]] bool IsUnit() const;
+};
+
 // `gameobject_addon` table
 struct GameObjectAddon
 {
+    QuaternionData ParentRotation;
     InvisibilityType invisibilityType;
     uint32 InvisibilityValue;
 };
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
@@ -1345,7 +1345,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama
     }
 
     int32 cleanDamage = 0;
-    if (Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))
+    if (!spellInfo->HasAttribute(SPELL_ATTR4_IGNORE_DAMAGE_TAKEN_MODIFIERS) && Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))
     {
         int32 oldDamage = damage;
         damage = Unit::CalcArmorReducedDamage(this, victim, damage, spellInfo, 0, attackType);
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
@@ -1355,8 +1355,8 @@ void ObjectMgr::LoadGameObjectAddons()
 {
     uint32 oldMSTime = getMSTime();
 
-    //                                               0     1                 2
-    QueryResult result = WorldDatabase.Query("SELECT guid, invisibilityType, invisibilityValue FROM gameobject_addon");
+    //                                               0     1                 2                 3                 4                 5                 6
+    QueryResult result = WorldDatabase.Query("SELECT guid, parent_rotation0, parent_rotation1, parent_rotation2, parent_rotation3, invisibilityType, invisibilityValue FROM gameobject_addon");
 
     if (!result)
     {
@@ -1380,8 +1380,9 @@ void ObjectMgr::LoadGameObjectAddons()
         }
 
         GameObjectAddon& gameObjectAddon = _gameObjectAddonStore[guid];
-        gameObjectAddon.invisibilityType = InvisibilityType(fields[1].Get<uint8>());
-        gameObjectAddon.InvisibilityValue = fields[2].Get<uint32>();
+        gameObjectAddon.ParentRotation = QuaternionData(fields[1].Get<float>(), fields[2].Get<float>(), fields[3].Get<float>(), fields[4].Get<float>());
+        gameObjectAddon.invisibilityType = InvisibilityType(fields[5].Get<uint8>());
+        gameObjectAddon.InvisibilityValue = fields[6].Get<uint32>();
 
         if (gameObjectAddon.invisibilityType >= TOTAL_INVISIBILITY_TYPES)
         {
@@ -1396,6 +1397,12 @@ void ObjectMgr::LoadGameObjectAddons()
             gameObjectAddon.InvisibilityValue = 1;
         }
 
+        if (!gameObjectAddon.ParentRotation.IsUnit())
+        {
+            LOG_ERROR("sql.sql", "GameObject (GUID: {}) has invalid parent rotation in `gameobject_addon`, set to default", guid);
+            gameObjectAddon.ParentRotation = QuaternionData();
+        }
+
         ++count;
     } while (result->NextRow());
 
diff --git a/src/server/game/Handlers/BankHandler.cpp b/src/server/game/Handlers/BankHandler.cpp
@@ -156,8 +156,6 @@ void WorldSession::HandleBuyBankSlotOpcode(WorldPackets::Bank::BuyBankSlot& buyB
     // next slot
     ++slot;
 
-    LOG_INFO("network", "PLAYER: Buy bank bag slot, slot number = {}", slot);
-
     BankBagSlotPricesEntry const* slotEntry = sBankBagSlotPricesStore.LookupEntry(slot);
 
     if (!slotEntry)
diff --git a/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp b/src/server/scripts/Northrend/Naxxramas/boss_gluth.cpp
@@ -256,7 +256,7 @@ class spell_gluth_decimate : public SpellScript
                 return;
             }
 
-            GetCaster()->CastSpell(unitTarget, SPELL_DECIMATE_DAMAGE);
+            GetCaster()->CastSpell(unitTarget, SPELL_DECIMATE_DAMAGE, true);
         }
     }
 
@@ -271,7 +271,7 @@ class spell_gluth_decimate_damage : public SpellScript
 {
     PrepareSpellScript(spell_gluth_decimate_damage)
 
-    void RecalculateDamage()
+    void HandleDamage(SpellEffIndex /*effIndex*/)
     {
         Unit* target = GetHitUnit();
         if (!target)
@@ -291,7 +291,7 @@ class spell_gluth_decimate_damage : public SpellScript
 
     void Register() override
     {
-        OnHit += SpellHitFn(spell_gluth_decimate_damage::RecalculateDamage);
+        OnEffectHitTarget += SpellEffectFn(spell_gluth_decimate_damage::HandleDamage, EFFECT_0, SPELL_EFFECT_SCHOOL_DAMAGE);
     }
 };
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+-- DB update 2026_02_04_01 -> 2026_02_04_02`
	`2`	`+-- Removes "Warsong Report" and "Battered Junkbox" (yes remove itself from itself) from "Battered Junkbox"`
	`3`	+DELETE FROM `item_loot_template` WHERE `Entry` = 16882 AND `Item` IN (16746, 16882);
Original file line number	Diff line number	Diff line change
`@@ -1345,7 +1345,7 @@ void Unit::CalculateSpellDamageTaken(SpellNonMeleeDamage* damageInfo, int32 dama`
`1345`	`1345`	`}`
`1346`	`1346`
`1347`	`1347`	`int32 cleanDamage = 0;`
`1348`		`- if (Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))`
	`1348`	`+ if (!spellInfo->HasAttribute(SPELL_ATTR4_IGNORE_DAMAGE_TAKEN_MODIFIERS) && Unit::IsDamageReducedByArmor(damageSchoolMask, spellInfo))`
`1349`	`1349`	`{`
`1350`	`1350`	`int32 oldDamage = damage;`
`1351`	`1351`	`damage = Unit::CalcArmorReducedDamage(this, victim, damage, spellInfo, 0, attackType);`
Original file line number	Diff line number	Diff line change
`@@ -1355,8 +1355,8 @@ void ObjectMgr::LoadGameObjectAddons()`
`1355`	`1355`	`{`
`1356`	`1356`	`uint32 oldMSTime = getMSTime();`
`1357`	`1357`
`1358`		`- // 0 1 2`
`1359`		`- QueryResult result = WorldDatabase.Query("SELECT guid, invisibilityType, invisibilityValue FROM gameobject_addon");`
	`1358`	`+ // 0 1 2 3 4 5 6`
	`1359`	`+ QueryResult result = WorldDatabase.Query("SELECT guid, parent_rotation0, parent_rotation1, parent_rotation2, parent_rotation3, invisibilityType, invisibilityValue FROM gameobject_addon");`
`1360`	`1360`
`1361`	`1361`	`if (!result)`
`1362`	`1362`	`{`
`@@ -1380,8 +1380,9 @@ void ObjectMgr::LoadGameObjectAddons()`
`1380`	`1380`	`}`
`1381`	`1381`
`1382`	`1382`	`GameObjectAddon& gameObjectAddon = _gameObjectAddonStore[guid];`
`1383`		`- gameObjectAddon.invisibilityType = InvisibilityType(fields[1].Get<uint8>());`
`1384`		`- gameObjectAddon.InvisibilityValue = fields[2].Get<uint32>();`
	`1383`	`+ gameObjectAddon.ParentRotation = QuaternionData(fields[1].Get<float>(), fields[2].Get<float>(), fields[3].Get<float>(), fields[4].Get<float>());`
	`1384`	`+ gameObjectAddon.invisibilityType = InvisibilityType(fields[5].Get<uint8>());`
	`1385`	`+ gameObjectAddon.InvisibilityValue = fields[6].Get<uint32>();`
`1385`	`1386`
`1386`	`1387`	`if (gameObjectAddon.invisibilityType >= TOTAL_INVISIBILITY_TYPES)`
`1387`	`1388`	`{`
`@@ -1396,6 +1397,12 @@ void ObjectMgr::LoadGameObjectAddons()`
`1396`	`1397`	`gameObjectAddon.InvisibilityValue = 1;`
`1397`	`1398`	`}`
`1398`	`1399`
	`1400`	`+ if (!gameObjectAddon.ParentRotation.IsUnit())`
	`1401`	`+ {`
	`1402`	+ LOG_ERROR("sql.sql", "GameObject (GUID: {}) has invalid parent rotation in `gameobject_addon`, set to default", guid);
	`1403`	`+ gameObjectAddon.ParentRotation = QuaternionData();`
	`1404`	`+ }`
	`1405`	`+`
`1399`	`1406`	`++count;`
`1400`	`1407`	`} while (result->NextRow());`
`1401`	`1408`