mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-18 01:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11980] Improve support for wild summoned GOs

Browse source 
* Support GetGameObject for wild summoned GOs
* Proper delete WildSummoned GOs after they are used
This commit is contained in:
Schmoozerd 2011-03-22 22:14:20 +01:00 • committed by Schmoozerd
parent c17fdc3093
commit d08edbd93c
5 changed files with 44 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/game/Unit.cpp
View file

@ -5013,6 +5013,10 @@ GameObject* Unit::GetGameObject(uint32 spellId) const
if ((*i)->GetSpellId() == spellId)
return *i;
WildGameObjectMap::const_iterator find = m_wildGameObjs.find(spellId);
if (find != m_wildGameObjs.end())
return GetMap()->GetGameObject(find->second); // Can be NULL
return NULL;
}
@ -5022,13 +5026,31 @@ void Unit::AddGameObject(GameObject* gameObj)
m_gameObj.push_back(gameObj);
gameObj->SetOwnerGuid(GetObjectGuid());
if ( GetTypeId()==TYPEID_PLAYER && gameObj->GetSpellId() )
if (GetTypeId() == TYPEID_PLAYER && gameObj->GetSpellId())
{
SpellEntry const* createBySpell = sSpellStore.LookupEntry(gameObj->GetSpellId());
// Need disable spell use for owner
if (createBySpell && createBySpell->HasAttribute(SPELL_ATTR_DISABLED_WHILE_ACTIVE))
// note: item based cooldowns and cooldown spell mods with charges ignored (unknown existing cases)
((Player*)this)->AddSpellAndCategoryCooldowns(createBySpell,0,NULL,true);
((Player*)this)->AddSpellAndCategoryCooldowns(createBySpell, 0, NULL, true);
}
}
void Unit::AddWildGameObject(GameObject* gameObj)
{
MANGOS_ASSERT(gameObj && gameObj->GetOwnerGuid().IsEmpty());
m_wildGameObjs[gameObj->GetSpellId()] = gameObj->GetObjectGuid();
// As of 335 there are no wild-summon spells with SPELL_ATTR_DISABLED_WHILE_ACTIVE
// Remove outdated wild summoned GOs
for (WildGameObjectMap::iterator itr = m_wildGameObjs.begin(); itr != m_wildGameObjs.end();)
{
GameObject* pGo = GetMap()->GetGameObject(itr->second);
if (pGo)
++itr;
else
m_wildGameObjs.erase(itr++);
}
}
@ -5055,7 +5077,7 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del)
m_gameObj.remove(gameObj);
if(del)
if (del)
{
gameObj->SetRespawnTime(0);
gameObj->Delete();
@ -5064,16 +5086,17 @@ void Unit::RemoveGameObject(GameObject* gameObj, bool del)
void Unit::RemoveGameObject(uint32 spellid, bool del)
{
if(m_gameObj.empty())
if (m_gameObj.empty())
return;
GameObjectList::iterator i, next;
for (i = m_gameObj.begin(); i != m_gameObj.end(); i = next)
{
next = i;
if(spellid == 0 || (*i)->GetSpellId() == spellid)
if (spellid == 0 || (*i)->GetSpellId() == spellid)
{
(*i)->SetOwnerGuid(ObjectGuid());
if(del)
if (del)
{
(*i)->SetRespawnTime(0);
(*i)->Delete();
@ -5089,13 +5112,16 @@ void Unit::RemoveGameObject(uint32 spellid, bool del)
void Unit::RemoveAllGameObjects()
{
// remove references to unit
for(GameObjectList::iterator i = m_gameObj.begin(); i != m_gameObj.end();)
for (GameObjectList::iterator i = m_gameObj.begin(); i != m_gameObj.end();)
{
(*i)->SetOwnerGuid(ObjectGuid());
(*i)->SetRespawnTime(0);
(*i)->Delete();
i = m_gameObj.erase(i);
}
// wild summoned GOs - only remove references, do not remove GOs
m_wildGameObjs.clear();
}
void Unit::SendSpellNonMeleeDamageLog(SpellNonMeleeDamage *log)