Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts: src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_druid.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/scripts/Spells/spell_warrior.cpp
2014-09-27 05:23:46 +02:00
parent eb4ff759ec eccc6e97ea
commit da91ae1f22
93 changed files with 2131 additions and 827 deletions
@@ -746,6 +746,13 @@ class spell_dru_savage_defense : public SpellScriptLoader
        {
            PrepareAuraScript(spell_dru_savage_defense_AuraScript);

+        public:
+            spell_dru_savage_defense_AuraScript()
+            {
+                absorbPct = 0;
+            }
+
+        private:
            uint32 absorbPct;

            bool Load() override