From 74e2d981ac1af4b0e9101c9e5e8a5bf23fd60566 Mon Sep 17 00:00:00 2001 From: Shauren Date: Fri, 22 Jul 2011 21:22:05 +0200 Subject: Core/GameObject: Refactored destructible building handling, properly implemented spell effect repair --- .../CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp | 4 ++-- src/server/scripts/Spells/spell_generic.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index ffe940acb27..bdccc540bb6 100755 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -204,7 +204,7 @@ class npc_announcer_toc10 : public CreatureScript return true; if (GameObject* floor = GameObject::GetGameObject(*player, instanceScript->GetData64(GO_ARGENT_COLISEUM_FLOOR))) - floor->TakenDamage(1000000); + floor->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED); creature->CastSpell(creature, 69016, false); @@ -319,7 +319,7 @@ class boss_lich_king_toc : public CreatureScript break; case 5080: if (GameObject* pGoFloor = m_pInstance->instance->GetGameObject(m_pInstance->GetData64(GO_ARGENT_COLISEUM_FLOOR))) - pGoFloor->TakenDamage(1000000); + pGoFloor->SetDestructibleState(GO_DESTRUCTIBLE_DESTROYED); me->CastSpell(me, 69016, false); if (m_pInstance) { diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index 41c7a3898de..5d8584e3cd1 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -983,7 +983,7 @@ class spell_gen_seaforium_blast : public SpellScriptLoader void Register() { - OnEffect += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_WMO_DAMAGE); + OnEffect += SpellEffectFn(spell_gen_seaforium_blast_SpellScript::AchievementCredit, EFFECT_1, SPELL_EFFECT_GAMEOBJECT_DAMAGE); } }; -- cgit v1.2.3