sync with azerothcore

This commit is contained in:
Yunfan Li
2023-12-12 21:02:23 +08:00
parent 748801b10b
commit 5e14f2f26d
8 changed files with 20 additions and 18 deletions

View File

@@ -29,7 +29,7 @@ class FindDeadPlayer : public FindPlayerPredicate
bool Check(Unit* unit) override
{
Player* player = unit->ToPlayer();
return player && !player->isResurrectRequested() && player->getDeathState() == CORPSE && !value->IsTargetOfSpellCast(player, predicate);
return player && !player->isResurrectRequested() && player->getDeathState() == DeathState::Corpse && !value->IsTargetOfSpellCast(player, predicate);
}
private:

View File

@@ -151,7 +151,7 @@ CreatureData const* BgMasterValue::NearestBm(bool allowDead)
continue;
//Is the unit dead?
if (unit->getDeathState() == DEAD)
if (unit->getDeathState() == DeathState::Dead)
continue;
}

View File

@@ -33,7 +33,7 @@ bool IsDeadValue::Calculate()
if (!target)
return false;
return target->getDeathState() != ALIVE;
return target->getDeathState() != DeathState::Alive;
}
bool PetIsDeadValue::Calculate()
@@ -51,7 +51,7 @@ bool PetIsDeadValue::Calculate()
if (bot->GetPetGUID() && !bot->GetPet())
return true;
return bot->GetPet() && bot->GetPet()->getDeathState() != ALIVE;
return bot->GetPet() && bot->GetPet()->getDeathState() != DeathState::Alive;
}
bool PetIsHappyValue::Calculate()