From 192dada7bd697f0bc4bfb3d3429f65a123d92285 Mon Sep 17 00:00:00 2001 From: w12x Date: Mon, 20 Oct 2008 13:34:00 -0500 Subject: [svn] Fixed a crash in OutdoorPvP*::BuffTeam(). --HG-- branch : trunk --- src/game/OutdoorPvPNA.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/game/OutdoorPvPNA.cpp') diff --git a/src/game/OutdoorPvPNA.cpp b/src/game/OutdoorPvPNA.cpp index c56ef95e157..1fb52295689 100644 --- a/src/game/OutdoorPvPNA.cpp +++ b/src/game/OutdoorPvPNA.cpp @@ -72,12 +72,12 @@ void OutdoorPvPNA::BuffTeam(uint32 team) for(std::set::iterator itr = m_PlayerGuids[0].begin(); itr != m_PlayerGuids[0].end(); ++itr) { if(Player * plr = objmgr.GetPlayer(*itr)) - plr->CastSpell(plr,NA_CAPTURE_BUFF,true); + if(plr->IsInWorld()) plr->CastSpell(plr,NA_CAPTURE_BUFF,true); } for(std::set::iterator itr = m_PlayerGuids[1].begin(); itr != m_PlayerGuids[1].end(); ++itr) { if(Player * plr = objmgr.GetPlayer(*itr)) - plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); + if(plr->IsInWorld()) plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); } } else if(team == HORDE) @@ -85,12 +85,12 @@ void OutdoorPvPNA::BuffTeam(uint32 team) for(std::set::iterator itr = m_PlayerGuids[1].begin(); itr != m_PlayerGuids[1].end(); ++itr) { if(Player * plr = objmgr.GetPlayer(*itr)) - plr->CastSpell(plr,NA_CAPTURE_BUFF,true); + if(plr->IsInWorld()) plr->CastSpell(plr,NA_CAPTURE_BUFF,true); } for(std::set::iterator itr = m_PlayerGuids[0].begin(); itr != m_PlayerGuids[0].end(); ++itr) { if(Player * plr = objmgr.GetPlayer(*itr)) - plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); + if(plr->IsInWorld()) plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); } } else @@ -98,12 +98,12 @@ void OutdoorPvPNA::BuffTeam(uint32 team) for(std::set::iterator itr = m_PlayerGuids[0].begin(); itr != m_PlayerGuids[0].end(); ++itr) { if(Player * plr = objmgr.GetPlayer(*itr)) - plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); + if(plr->IsInWorld()) plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); } for(std::set::iterator itr = m_PlayerGuids[1].begin(); itr != m_PlayerGuids[1].end(); ++itr) { if(Player * plr = objmgr.GetPlayer(*itr)) - plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); + if(plr->IsInWorld()) plr->RemoveAurasDueToSpell(NA_CAPTURE_BUFF); } } } -- cgit v1.2.3