*Remove some redundant code, and relocate some illogical code.
--HG-- branch : trunk
This commit is contained in:
@@ -2007,7 +2007,7 @@ bool Creature::IsVisibleInGridForPlayer(Player const* pl) const
|
||||
// Live player (or with not release body see live creatures or death creatures with corpse disappearing time > 0
|
||||
if(pl->isAlive() || pl->GetDeathTimer() > 0)
|
||||
{
|
||||
if( GetEntry() == VISUAL_WAYPOINT && !pl->isGameMaster() )
|
||||
if( GetEntry() == VISUAL_WAYPOINT )
|
||||
return false;
|
||||
return (isAlive() || m_deathTimer > 0 || (m_isDeadByDefault && m_deathState==CORPSE));
|
||||
}
|
||||
|
||||
@@ -521,10 +521,10 @@ void Master::_OnSignal(int s)
|
||||
break;
|
||||
case SIGTERM:
|
||||
#ifdef _WIN32
|
||||
if (m_ServiceStatus != 1)
|
||||
case SIGBREAK:
|
||||
#endif
|
||||
World::StopNow(SHUTDOWN_EXIT_CODE);
|
||||
if (m_ServiceStatus != 1)
|
||||
World::StopNow(SHUTDOWN_EXIT_CODE);
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user