diff options
author | QAston <qaston@gmail.com> | 2011-09-03 18:07:27 +0200 |
---|---|---|
committer | QAston <qaston@gmail.com> | 2011-09-03 18:07:27 +0200 |
commit | f31e6761999d77e93a19925a5d73e54250d67ebb (patch) | |
tree | dbf5982d90e167c19effa64a0e7098bcc6a3ba0a | |
parent | df19a0c31f35d9453523b198b07608c42c4e1fd9 (diff) |
Fix build after recent pull merges.
-rwxr-xr-x | src/server/game/Spells/SpellMgr.cpp | 2 | ||||
-rwxr-xr-x | src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index b44c7f58ef5..90c466cf450 100755 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -2652,7 +2652,7 @@ void SpellMgr::LoadSpellCustomAttr() case SPELL_AURA_PERIODIC_ENERGIZE: case SPELL_AURA_OBS_MOD_HEALTH: case SPELL_AURA_OBS_MOD_POWER: - case SPELL_AURA_POWER_BURN_MANA: + case SPELL_AURA_POWER_BURN: spellInfo->AttributesCu |= SPELL_ATTR0_CU_NO_INITIAL_THREAT; break; } diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp index 91cd8dee55c..7566d9bc410 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/instance_trial_of_the_crusader.cpp @@ -85,7 +85,6 @@ class instance_trial_of_the_crusader : public InstanceMapScript EventStage = 0; TributeChestGUID = 0; - DataDamageTwin = 0; MainGateDoorGUID = 0; EastPortcullisGUID = 0; |