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

Merge commit 'origin/master' into 310

Browse source 
Conflicts:
	src/game/UpdateData.cpp
This commit is contained in:
tomrus88 2009-06-07 21:42:02 +04:00
commit 1f87157edf
20 changed files with 195 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/game/GameObject.cpp
View file

@ -396,7 +396,10 @@ void GameObject::Update(uint32 /*p_time*/)
if(GetOwnerGUID())
{
m_respawnTime = 0;
if(Unit* owner = GetOwner())
owner->RemoveGameObject(this, false);
SetRespawnTime(0);
Delete();
return;
}