From 3eb938b8de6cefc39dfe3ed8a0001279c42002ee Mon Sep 17 00:00:00 2001 From: megamage Date: Sun, 9 Aug 2009 15:33:45 -0500 Subject: [8331] Restore spirit guids work, step 2 Author: VladimirMangos Remove hack in battleground code that prevent proper work guids in result sabotage of now correct work spell itself. --HG-- branch : trunk --- src/game/BattleGround.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 709cac492d5..a80a06b3572 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -280,10 +280,12 @@ void BattleGround::Update(uint32 diff) sh = plr->GetMap()->GetCreature(itr->first); // only for visual effect if (sh) - sh->CastSpell(sh, SPELL_SPIRIT_HEAL, true); // Spirit Heal, effect 117 + // Spirit Heal, effect 117 + sh->CastSpell(sh, SPELL_SPIRIT_HEAL, true); } - plr->CastSpell(plr, SPELL_RESURRECTION_VISUAL, true); // Resurrection visual + // Resurrection visual + plr->CastSpell(plr, SPELL_RESURRECTION_VISUAL, true); m_ResurrectQueue.push_back(*itr2); } (itr->second).clear(); @@ -1397,12 +1399,7 @@ void BattleGround::AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid if (!plr) return; - SpellEntry const *spellInfo = sSpellStore.LookupEntry( SPELL_WAITING_FOR_RESURRECT ); - if (spellInfo) - { - Aura *Aur = new Aura(spellInfo, 1, NULL, plr); - plr->AddAura(Aur); - } + plr->CastSpell(plr, SPELL_WAITING_FOR_RESURRECT, true); } void BattleGround::RemovePlayerFromResurrectQueue(uint64 player_guid) -- cgit v1.2.3