warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

perf(ai): make IsEnemy the single authority for Honor/Ethereal Voyage (#2655)

Browse source 
## Summary
Profiling with thousands of creatures in range of each other showed `BaseAI.IsInvalidFactionTarget` checking Ethereal Voyage and active Honor on every acquisition candidate and then calling `BaseCreature.IsEnemy`, which checked both again. This makes `IsEnemy` the single authority and removes the duplicate per-pair work.

## Changes
- **`BaseCreature.IsEnemy`**: the Ethereal Voyage check sat below the `m is not BaseCreature` early return, so it never reached players — the only mobiles that cast it. It is hoisted next to the Honor veto. `GetMaster()` was called three times per creature pair (inside `Ethics.Player.Find(m, true)` and twice at the bottom); it is now computed once.
- **`BaseAI.IsInvalidFactionTarget`**: reduced to `IsFriend` / `IsEnemy` / `CanBeHarmful`. The removed `Combatant != m` Honor exception was dead code — `IsEnemy` vetoed Honor unconditionally on the following line.
- **`Ethics.Player.Find`** / **`TransformationSpellHelper.GetContext`**: small simplifications on the same path.

## Behavior
- `ShouldAcquireOnApproach` and `OnAggressiveAction` only consult `IsEnemy`, so movement-triggered acquisition now respects Ethereal Voyage for players (previously a player under Ethereal Voyage walking past a monster was still acquired on approach).
- `BaseFactionGuard.IsEnemy` does not call base, so faction guards no longer skip honoring/voyaging enemy-faction players. Accepted: both mechanics describe monsters, not guards.
- `HealerAI`/`BerserkAI`/`PredatorAI` (`bFacFriend`) callers are unaffected — `IsFriend` already required a `BaseCreature`, so players were excluded before these checks ran. `MilitiaFighter`/`MilitiaCanoneer` return `false` for all players, so they are unaffected too.

## Testing
- `dotnet build` clean.
- Pure predicate reorder; no new tests.
This commit is contained in:
Kamron Batman 2026-09-18 19:22:22 -07:00 • committed by GitHub
parent 35e3a31b4c
commit f211607d63
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 14 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Projects/UOContent/Mobiles/BaseCreature.cs
View file

@ -1704,36 +1704,35 @@ namespace Server.Mobiles
return false;
}
var c = m as BaseCreature;
var cMaster = c?.GetMaster();
var ourEthic = EthicAllegiance;
var pl = Ethics.Player.Find(m, true);
var pl = Ethics.Player.Find(cMaster ?? m, false);
if (pl?.IsShielded == true && (ourEthic == null || ourEthic == pl.Ethic))
{
return false;
}
if (VirtueSystem.GetVirtues(m as PlayerMobile)?.HonorActive == true)
// Player-only protections; they must veto before the non-creature early return below.
if (VirtueSystem.GetVirtues(m as PlayerMobile)?.HonorActive == true ||
TransformationSpellHelper.UnderTransformation(m, typeof(EtherealVoyageSpell)))
{
return false;
}
if (m is not BaseCreature c || m is MilitiaFighter)
if (c == null || m is MilitiaFighter)
{
return true;
}
if (TransformationSpellHelper.UnderTransformation(m, typeof(EtherealVoyageSpell)))
{
return false;
}
if (_team != c.Team || FightMode == FightMode.Evil && m.Karma < 0 || c.FightMode == FightMode.Evil && Karma < 0)
{
return true;
}
var master = GetMaster();
var cMaster = c.GetMaster();
if (master == null)
{