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

merged ed3d3ccde9

Browse source
This commit is contained in:
sanctum32 2013-10-21 06:58:21 +03:00 • committed by Antz
parent 28ad733c49
commit 6c84f6f537
2 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/game/GameObject.cpp
View file

@ -301,6 +301,13 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
{ {
// can be despawned or destroyed // can be despawned or destroyed
SetLootState(GO_JUST_DEACTIVATED); SetLootState(GO_JUST_DEACTIVATED);
// Remove Wild-Summoned GO on timer expire
if (!HasStaticDBSpawnData())
{
if (Unit* owner = GetOwner())
owner->RemoveGameObject(this, false);
Delete();
}
return; return;
} }
@ -433,13 +440,11 @@ void GameObject::Update(uint32 update_diff, uint32 p_time)
break; break;
} }
if (!HasStaticDBSpawnData()) // Remove wild summoned after use // Remove wild summoned after use
if (!HasStaticDBSpawnData() && (!GetSpellId() || GetGOInfo()->GetDespawnPossibility()))
{ {
if (GetOwnerGuid()) if (Unit* owner = GetOwner())
if (Unit* owner = GetOwner()) owner->RemoveGameObject(this, false);
owner->RemoveGameObject(this, false);
SetRespawnTime(0);
Delete(); Delete();
return; return;
} }

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "12689" #define REVISION_NR "12690"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__