Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 10:56:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Phases: Defined default phaseID

Browse Source
This commit is contained in:
Rat
2015-03-29 17:56:20 +02:00
parent 3d84ab74b0
commit 81df6b2ad2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/server/game/Entities/Object/Object.cpp
View File

@@ -3140,10 +3140,10 @@ bool WorldObject::IsInPhase(WorldObject const* obj) const
if (_phases.empty() && obj->GetPhases().empty())
return true;
if (_phases.empty() && obj->IsInPhase(169))
if (_phases.empty() && obj->IsInPhase(DEFAULT_PHASE))
return true;
if (obj->GetPhases().empty() && IsInPhase(169))
if (obj->GetPhases().empty() && IsInPhase(DEFAULT_PHASE))
return true;
if (GetTypeId() == TYPEID_PLAYER && ToPlayer()->IsGameMaster())

2
src/server/game/Entities/Object/Object.h
View File

@@ -46,6 +46,8 @@
#define NOMINAL_MELEE_RANGE 5.0f
#define MELEE_RANGE (NOMINAL_MELEE_RANGE - MIN_MELEE_REACH * 2) //center to center for players
#define DEFAULT_PHASE 169
enum TempSummonType
{
TEMPSUMMON_TIMED_OR_DEAD_DESPAWN = 1, // despawns after a specified time OR when the creature disappears