Merge pull request #12131 from Trisjdc/resting
Core/Players: Implement resting for areas with AREA_FLAG_REST_ZONE_ALLIANCE or AREA_FLAG_REST_ZONE_HORDE
This commit is contained in:
commit
d6414bd9a5
2 files changed
+19
-4
No files matched your search
@@ -7480,6 +7480,19 @@ void Player::UpdateArea(uint32 newArea)
|
||||
}
|
||||
else
|
||||
RemoveByteFlag(UNIT_FIELD_BYTES_2, 1, UNIT_BYTE2_FLAG_SANCTUARY);
|
||||
|
||||
uint32 const areaRestFlag = (GetTeam() == ALLIANCE) ? AREA_FLAG_REST_ZONE_ALLIANCE : AREA_FLAG_REST_ZONE_HORDE;
|
||||
if (area && area->flags & areaRestFlag)
|
||||
{
|
||||
SetFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
|
||||
SetRestType(REST_TYPE_IN_FACTION_AREA);
|
||||
InnEnter(time(0), GetMapId(), 0, 0, 0);
|
||||
}
|
||||
else if (HasFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING) && GetRestType() == REST_TYPE_IN_FACTION_AREA)
|
||||
{
|
||||
RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
|
||||
SetRestType(REST_TYPE_NO);
|
||||
}
|
||||
}
|
||||
|
||||
void Player::UpdateZone(uint32 newZone, uint32 newArea)
|
||||
@@ -7565,8 +7578,9 @@ void Player::UpdateZone(uint32 newZone, uint32 newArea)
|
||||
SetRestType(REST_TYPE_NO);
|
||||
}
|
||||
}
|
||||
else // Recently left a capital city
|
||||
else if (GetRestType() != REST_TYPE_IN_FACTION_AREA) // handled in UpdateArea
|
||||
{
|
||||
// Recently left a capital city
|
||||
RemoveFlag(PLAYER_FLAGS, PLAYER_FLAGS_RESTING);
|
||||
SetRestType(REST_TYPE_NO);
|
||||
}
|
||||
|
||||
@@ -729,9 +729,10 @@ class InstanceSave;
|
||||
|
||||
enum RestType
|
||||
{
|
||||
REST_TYPE_NO = 0,
|
||||
REST_TYPE_IN_TAVERN = 1,
|
||||
REST_TYPE_IN_CITY = 2
|
||||
REST_TYPE_NO = 0,
|
||||
REST_TYPE_IN_TAVERN = 1,
|
||||
REST_TYPE_IN_CITY = 2,
|
||||
REST_TYPE_IN_FACTION_AREA = 3 // used with AREA_FLAG_REST_ZONE_*
|
||||
};
|
||||
|
||||
enum TeleportToOptions
|
||||
|
||||
Reference in new issue
Block a user