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

#W# Confict: Fixed BaseCreature git merge conflict.

Browse source
This commit is contained in:
WarrentyExpired 2026-10-10 23:17:41 -04:00
commit ad38314ca7
112 changed files with 5397 additions and 616 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Projects/UOContent/Mobiles/PlayerMobile.cs
View file

@ -3612,7 +3612,7 @@ namespace Server.Mobiles
foreach (var follower in allFollowers)
{
if (follower is not BaseCreature pet || pet.ControlMaster == null)
if (follower is not BaseCreature { Controlled: true } pet || pet.ControlMaster == null)
{
continue;
}
@ -3648,7 +3648,6 @@ namespace Server.Mobiles
pet.Internalize();
pet.SetControlMaster(null);
pet.SummonMaster = null;
pet.IsStabled = true;
pet.StabledBy = this;
@ -3697,11 +3696,6 @@ namespace Server.Mobiles
{
pet.SetControlMaster(this);
if (pet.SummonMaster != null)
{
pet.SummonMaster = this;
}
pet.ControlTarget = this;
pet.ControlOrder = OrderType.Follow;
@ -3953,6 +3947,35 @@ namespace Server.Mobiles
Stabled = null;
}
if (_allFollowers?.Count > 0)
{
// Releasing or deleting a follower removes it from _allFollowers.
using var followers = PooledRefQueue<BaseCreature>.Create(_allFollowers.Count);
foreach (var follower in _allFollowers)
{
// Escorts and hirelings notice a deleted master and walk off on their own.
if (follower is BaseCreature bc and not (BaseEscortable or BaseHire))
{
followers.Enqueue(bc);
}
}
while (followers.Count > 0)
{
var bc = followers.Dequeue();
if (bc.Summoned || bc.IsBonded || bc.IsDeadPet)
{
bc.Delete();
}
else
{
// An unbonded pet goes wild and despawns on the abandoned-pet timer.
bc.ControlOrder = OrderType.Release;
}
}
}
}
public override int ComputeMovementSpeed(Direction dir, bool checkTurning = true)