diff options
| author | Shocker <none@none> | 2010-08-26 06:49:31 +0300 |
|---|---|---|
| committer | Shocker <none@none> | 2010-08-26 06:49:31 +0300 |
| commit | 2748f86bdbbdaa039a82af18e062b307b1fd562f (patch) | |
| tree | fd59d7f23aa492beed681696c2f799859ac1dbdb /src/server/game/Entities | |
| parent | aa768001a766cc25d3944bb80a80e4deb6c2c429 (diff) | |
Fix crash when using a pool template with an entry > 65535, fixes issue #3632
--HG--
branch : trunk
Diffstat (limited to 'src/server/game/Entities')
| -rw-r--r-- | src/server/game/Entities/Creature/Creature.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/GameObject/GameObject.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Creature/Creature.cpp b/src/server/game/Entities/Creature/Creature.cpp index 40db0009ebe..727ffef5708 100644 --- a/src/server/game/Entities/Creature/Creature.cpp +++ b/src/server/game/Entities/Creature/Creature.cpp @@ -1604,7 +1604,7 @@ void Creature::Respawn(bool force) if (IsAIEnabled) AI()->JustRespawned(); - uint16 poolid = GetDBTableGUIDLow() ? sPoolMgr.IsPartOfAPool<Creature>(GetDBTableGUIDLow()) : 0; + uint32 poolid = GetDBTableGUIDLow() ? sPoolMgr.IsPartOfAPool<Creature>(GetDBTableGUIDLow()) : 0; if (poolid) sPoolMgr.UpdatePool<Creature>(poolid, GetDBTableGUIDLow()); diff --git a/src/server/game/Entities/GameObject/GameObject.cpp b/src/server/game/Entities/GameObject/GameObject.cpp index e987b30e098..a9404046175 100644 --- a/src/server/game/Entities/GameObject/GameObject.cpp +++ b/src/server/game/Entities/GameObject/GameObject.cpp @@ -318,7 +318,7 @@ void GameObject::Update(uint32 diff) return; } // respawn timer - uint16 poolid = GetDBTableGUIDLow() ? sPoolMgr.IsPartOfAPool<GameObject>(GetDBTableGUIDLow()) : 0; + uint32 poolid = GetDBTableGUIDLow() ? sPoolMgr.IsPartOfAPool<GameObject>(GetDBTableGUIDLow()) : 0; if (poolid) sPoolMgr.UpdatePool<GameObject>(poolid, GetDBTableGUIDLow()); else @@ -560,7 +560,7 @@ void GameObject::Delete() SetGoState(GO_STATE_READY); SetUInt32Value(GAMEOBJECT_FLAGS, GetGOInfo()->flags); - uint16 poolid = GetDBTableGUIDLow() ? sPoolMgr.IsPartOfAPool<GameObject>(GetDBTableGUIDLow()) : 0; + uint32 poolid = GetDBTableGUIDLow() ? sPoolMgr.IsPartOfAPool<GameObject>(GetDBTableGUIDLow()) : 0; if (poolid) sPoolMgr.UpdatePool<GameObject>(poolid, GetDBTableGUIDLow()); else |