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

fix: Fixes guards attacking mobs (#2145)

Browse source 
### Summary

- Fixes infinite teleport from guard refactor for spawners
- Fixes guards not attacking Always Murderer creatures
- Fixes crash when calling guards due to map modification while enumeration
This commit is contained in:
Kamron Batman 2025-03-12 16:45:39 -07:00 • committed by GitHub
parent 47da961a37
commit 2c6f1854fa
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 49 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/UOContent/Mobiles/Guards/BaseGuard.cs
View file

@ -203,6 +203,8 @@ public class GuardIdleTimer : Timer
{
BaseGuard.TeleportTo(_owner, _owner.Spawner.HomeLocation);
}
Stop();
}
}
}

75
Projects/UOContent/Regions/GuardedRegion.cs
View file

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text.Json.Serialization;
using Server.Collections;
using Server.Mobiles;
namespace Server.Regions;
@ -187,7 +188,7 @@ public class GuardedRegion : BaseRegion
return;
}
if (!AllowReds && m.Kills >= 5)
if (!AllowReds && (m.Kills >= 5 || m is BaseCreature { AlwaysMurderer: true }))
{
CheckGuardCandidate(m);
}
@ -251,7 +252,7 @@ public class GuardedRegion : BaseRegion
public void CheckGuardCandidate(Mobile m)
{
if (IsDisabled() || !IsGuardCandidate(m))
if (!IsGuardCandidate(m))
{
return;
}
@ -276,16 +277,18 @@ public class GuardedRegion : BaseRegion
foreach (var v in m.GetMobilesInRange(8))
{
if (!v.Player && v != m && !IsGuardCandidate(v) &&
((v as BaseCreature)?.IsHumanInTown() ?? v.Body.IsHuman && v.Region.IsPartOf(this)))
if (v.Player || v == m || IsGuardCandidate(v) ||
!((v as BaseCreature)?.IsHumanInTown() ?? v.Body.IsHuman && v.Region.IsPartOf(this)))
{
var dist = m.GetDistanceToSqrt(v);
continue;
}
if (fakeCall == null || dist < prio)
{
fakeCall = v;
prio = dist;
}
var dist = m.GetDistanceToSqrt(v);
if (fakeCall == null || dist < prio)
{
fakeCall = v;
prio = dist;
}
}
@ -308,32 +311,48 @@ public class GuardedRegion : BaseRegion
public void CallGuards(Point3D p)
{
if (IsDisabled())
{
return;
}
using var queue = PooledRefQueue<Mobile>.Create();
foreach (var m in Map.GetMobilesInRange(p, 14))
{
if (IsGuardCandidate(m) &&
(!AllowReds && m.Kills >= 5 && m.Region.IsPartOf(this) || m_GuardCandidates.ContainsKey(m)))
if (!IsGuardCandidate(m) || !m.Region.IsPartOf(this) && !m_GuardCandidates.ContainsKey(m))
{
if (m_GuardCandidates.Remove(m, out var timer))
{
timer.Stop();
}
MakeGuard(m);
m.SendLocalizedMessage(502276); // Guards can no longer be called on you.
break;
continue;
}
if (m_GuardCandidates.Remove(m, out var timer))
{
timer.Stop();
}
queue.Enqueue(m);
break;
}
while (queue.Count > 0)
{
var m = queue.Dequeue();
MakeGuard(m);
m.SendLocalizedMessage(502276); // Guards can no longer be called on you.
}
}
public bool IsGuardCandidate(Mobile m) =>
m is not BaseGuard && m.Alive && m.AccessLevel <= AccessLevel.Player && !m.Blessed &&
(m is not BaseCreature creature || !creature.IsInvulnerable) && !IsDisabled() &&
(!AllowReds && m.Kills >= 5 || m.Criminal);
public bool IsGuardCandidate(Mobile m)
{
if (m is BaseGuard || !m.Alive || m.AccessLevel > AccessLevel.Player || m.Blessed)
{
return false;
}
var bc = m as BaseCreature;
if (bc?.IsInvulnerable == true)
{
return false;
}
return !AllowReds && (m.Kills >= 5 || bc?.AlwaysMurderer == true) || m.Criminal;
}
private class GuardTimer : Timer
{