Core/Phases: Defined default phaseID

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
+2 -2
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())