Merge c8db39e9e82246f988dcc8007f11ff1c3a21547b into ec274182a2a0e72d2f3eb2d5118a6d8fe95b02ef

This commit is contained in:
Seamthesis 2025-11-09 08:59:12 +01:00 committed by GitHub
commit f4d11042c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 3 deletions

View File

@ -1106,6 +1106,8 @@ public:
void Update(uint32 time) override;
void Heartbeat() override;
PlayerFlags GetPlayerFlags() const { return PlayerFlags(GetUInt32Value(PLAYER_FLAGS)); }
bool HasPlayerFlag(PlayerFlags flags) const { return HasFlag(PLAYER_FLAGS, flags) != 0; }
void SetPlayerFlag(PlayerFlags flags) { SetFlag(PLAYER_FLAGS, flags); }

View File

@ -384,9 +384,6 @@ void Player::Update(uint32 p_time)
}
}
// group update
SendUpdateToOutOfRangeGroupMembers();
Pet* pet = GetPet();
if (pet && !pet->IsWithinDistInMap(this, GetMap()->GetVisibilityRange()) &&
!pet->isPossessed())
@ -426,6 +423,14 @@ void Player::Update(uint32 p_time)
}
}
void Player::Heartbeat()
{
Unit::Heartbeat();
// Group update
SendUpdateToOutOfRangeGroupMembers();
}
void Player::UpdateMirrorTimers()
{
// Desync flags for update on next HandleDrowning