aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Entities/GameObject
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2011-05-16 15:36:02 +0200
committerShauren <shauren.trinity@gmail.com>2011-05-16 15:36:02 +0200
commita28da3582ea1db873d0760d4967d58ed44094f0c (patch)
tree4b4e47c390ab65e9029f2dbb709ff46d3b7374ee /src/server/game/Entities/GameObject
parent9650ba678bad77bc3b401e71b209cbf4dd5debb2 (diff)
Core/Objects: Fixed linked respawn cases when linking to itself in order to prevent respawning
Diffstat (limited to 'src/server/game/Entities/GameObject')
-rwxr-xr-xsrc/server/game/Entities/GameObject/GameObject.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp
index b329123cc0b..f79b2ddbb23 100755
--- a/src/server/game/Entities/GameObject/GameObject.cpp
+++ b/src/server/game/Entities/GameObject/GameObject.cpp
@@ -332,7 +332,7 @@ void GameObject::Update(uint32 diff)
if (linkedRespawntime) // Can't respawn, the master is dead
{
uint64 targetGuid = sObjectMgr->GetLinkedRespawnGuid(dbtableHighGuid);
- if (targetGuid == GetGUID()) // if linking self, never respawn (check delayed to next day)
+ if (targetGuid == dbtableHighGuid) // if linking self, never respawn (check delayed to next day)
SetRespawnTime(DAY);
else
m_respawnTime = (now > linkedRespawntime ? now : linkedRespawntime)+urand(5, MINUTE); // else copy time from master and add a little