Merge branch 'master' into Playerbot

This commit is contained in:
Yunfan Li
2024-08-26 22:29:54 +08:00
358 changed files with 1165 additions and 1381 deletions

View File

@@ -1947,7 +1947,7 @@ void Player::UpdateCharmedAI()
1 << (CLASS_PRIEST - 1));
// Xinef: charmer type specific actions
if (charmer->GetTypeId() == TYPEID_PLAYER)
if (charmer->IsPlayer())
{
bool follow = false;
if (!target)