From 4e2536df45af22920c15a9e8ff67ddda92180c0a Mon Sep 17 00:00:00 2001 From: VladimirMangos Date: Sun, 9 Aug 2009 00:45:55 +0400 Subject: [PATCH] [8331] Restore spirit guids work, step 2 Remove hack in battleground code that prevent proper work guids in result sabotage of now correct work spell itself. --- src/game/BattleGround.cpp | 12 ++++-------- src/shared/revision_nr.h | 2 +- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp index 9449e4f6e..97cd09ab1 100644 --- a/src/game/BattleGround.cpp +++ b/src/game/BattleGround.cpp @@ -274,10 +274,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(); @@ -1321,12 +1323,6 @@ void BattleGround::AddPlayerToResurrectQueue(uint64 npc_guid, uint64 player_guid return; plr->CastSpell(plr, SPELL_WAITING_FOR_RESURRECT, true); - SpellEntry const *spellInfo = sSpellStore.LookupEntry( SPELL_WAITING_FOR_RESURRECT ); - if (spellInfo) - { - Aura *Aur = CreateAura(spellInfo, 0, NULL, plr); - plr->AddAura(Aur); - } } void BattleGround::RemovePlayerFromResurrectQueue(uint64 player_guid) diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 33c419cd5..ffe6e9613 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8330" + #define REVISION_NR "8331" #endif // __REVISION_NR_H__