diff options
| -rw-r--r-- | src/game/ObjectMgr.cpp | 29 | ||||
| -rw-r--r-- | src/shared/revision_nr.h | 2 |
2 files changed, 2 insertions, 29 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 2dd63e1691a..09c0b127118 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -1055,37 +1055,10 @@ void ObjectMgr::LoadCreatures() sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with `phaseMask`=0 (not visible for anyone), set to 1.",guid,data.id ); data.phaseMask = 1; } - else - { - int count = 0; - for(int i=0; i < sizeof(data.phaseMask)*8; ++i) - if(data.phaseMask & (1 << i)) - ++count; - - if(count > 1) - { - uint32 phaseMask = data.phaseMask & ~PHASEMASK_NORMAL; - count = 0; - for(int i=0; i < sizeof(phaseMask)*8; ++i) - if(phaseMask & (1 << i)) - ++count; - - if(count > 1) - { - sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with more single bit set in `phaseMask` (not visible for anyone), set to 1.",guid,data.id ); - data.phaseMask = phaseMask; - } - else - { - sLog.outErrorDb("Table `creature` have creature (GUID: %u Entry: %u) with more single bit set in `phaseMask` (not visible for anyone), set to %u (possible expected).",guid,data.id,phaseMask); - data.phaseMask = 1; - } - - } - } if (gameEvent==0 && PoolId==0) // if not this is to be managed by GameEvent System or Pool system AddCreatureToGrid(guid, &data); + ++count; } while (result->NextRow()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index e96791f833d..a61bba635ea 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "7308" + #define REVISION_NR "7309" #endif // __REVISION_NR_H__ |