Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Update instance script functions.

Browse Source 
--HG--
branch : trunk
This commit is contained in:
megamage
2009-05-06 00:06:38 -05:00
parent f4e8654337
commit 3f6f15e34b
4 changed files with 45 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/GameObject.cpp
View File

@@ -95,7 +95,7 @@ void GameObject::RemoveFromWorld()
{
if(Map *map = FindMap())
if(map->IsDungeon() && ((InstanceMap*)map)->GetInstanceData())
((InstanceMap*)map)->GetInstanceData()->OnObjectRemove(this);
((InstanceMap*)map)->GetInstanceData()->OnObjectCreate(this, false);
// Possible crash at access to deleted GO in Unit::m_gameobj
if(uint64 owner_guid = GetOwnerGUID())
{
@@ -1362,7 +1362,8 @@ void GameObject::CastSpell(Unit* target, uint32 spellId)
if(self)
{
target->CastSpell(target, spellInfo, true);
if(target)
target->CastSpell(target, spellInfo, true);
return;
}
@@ -1379,7 +1380,7 @@ void GameObject::CastSpell(Unit* target, uint32 spellId)
else
{
trigger->setFaction(14);
trigger->CastSpell(target, spellInfo, true, 0, 0, target->GetGUID());
trigger->CastSpell(target, spellInfo, true);
}
//trigger->setDeathState(JUST_DIED);
//trigger->RemoveCorpse();