yolinlin/mod-playerbots
1
0
Fork 0
mirror of https://github.com/mod-playerbots/mod-playerbots synced 2025-11-29 15:58:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix IsInPvpProhibitedZone

Browse Source
This commit is contained in:
Yunfan Li
2023-07-31 12:47:24 +08:00
parent aaae6b6476
commit ead4a2fe56
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/strategy/actions/ChooseTargetActions.cpp
View File

@@ -16,7 +16,7 @@ bool AttackEnemyPlayerAction::isUseful()
if (bot->HasAura(23333) || bot->HasAura(23335) || bot->HasAura(34976))
return false;
return !sPlayerbotAIConfig->IsInPvpProhibitedZone(bot->GetAreaId());
return !sPlayerbotAIConfig->IsInPvpProhibitedZone(bot->GetZoneId());
}
bool AttackEnemyFlagCarrierAction::isUseful()

2
src/strategy/actions/RpgSubActions.cpp
View File

@@ -459,7 +459,7 @@ bool RpgTradeUsefulAction::Execute(Event event)
bool RpgDuelAction::isUseful()
{
// do not offer duel in non pvp areas
if (sPlayerbotAIConfig->IsInPvpProhibitedZone(bot->GetAreaId()))
if (sPlayerbotAIConfig->IsInPvpProhibitedZone(bot->GetZoneId()))
return false;
// Players can only fight a duel with each other outside (=not inside dungeons and not in capital cities)

2
src/strategy/values/EnemyPlayerValue.cpp
View File

@@ -10,7 +10,7 @@ bool NearestEnemyPlayersValue::AcceptUnit(Unit* unit)
{
bool inCannon = botAI->IsInVehicle(false, true);
Player* enemy = dynamic_cast<Player*>(unit);
if (enemy && botAI->IsOpposing(enemy) && enemy->IsPvP() && !sPlayerbotAIConfig->IsInPvpProhibitedZone(enemy->GetAreaId()) &&
if (enemy && botAI->IsOpposing(enemy) && enemy->IsPvP() && !sPlayerbotAIConfig->IsInPvpProhibitedZone(enemy->GetZoneId()) &&
!enemy->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE | UNIT_FLAG_NON_ATTACKABLE_2) && ((inCannon || !enemy->HasFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE))) &&
/*!enemy->HasStealthAura() && !enemy->HasInvisibilityAura()*/ enemy->CanSeeOrDetect(bot) && !(enemy->HasAuraType(SPELL_AURA_SPIRIT_OF_REDEMPTION)))
return true;