From 0d8b5c21429b5f943c872ee11df369dba5254929 Mon Sep 17 00:00:00 2001 From: Software Engineer Date: Wed, 16 Dec 2015 18:55:01 +0100 Subject: Server/ObjectMgr: Added Error Log And Server Shutdown At ID Overflow --- src/server/game/Globals/ObjectMgr.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index ea71887f472..1e846387d02 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -6381,12 +6381,22 @@ uint32 ObjectMgr::GenerateMailID() uint32 ObjectMgr::GeneratePetNumber() { - return ++_hiPetNumber; + if (_hiPetNumber >= 0xFFFFFFFE) + { + TC_LOG_ERROR("misc", "_hiPetNumber Id overflow!! Can't continue, shutting down server. "); + World::StopNow(ERROR_EXIT_CODE); + } + return _hiPetNumber++; } uint64 ObjectMgr::GenerateVoidStorageItemId() { - return ++_voidItemId; + if (_voidItemId >= uint64(0xFFFFFFFFFFFFFFFELL)) + { + TC_LOG_ERROR("misc", "_voidItemId overflow!! Can't continue, shutting down server. "); + World::StopNow(ERROR_EXIT_CODE); + } + return _voidItemId++; } uint64 ObjectMgr::GenerateCreatureSpawnId() -- cgit v1.2.3