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

fix: Fixes RemoveFollowers called twice (#1437)

Browse source
This commit is contained in:
Kamron Batman 2023-07-29 15:44:23 -07:00 • committed by GitHub
parent d6ebe67dd8
commit 56c40fffbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2260,39 +2260,25 @@ namespace Server.Mobiles
public void RemoveFollowers()
{
if (m_ControlMaster != null)
var master = m_ControlMaster ?? m_SummonMaster;
if (master != null)
{
m_ControlMaster.Followers -= Math.Min(ControlSlots, m_ControlMaster.Followers);
if (m_ControlMaster is PlayerMobile mobile)
master.Followers -= Math.Min(ControlSlots, master.Followers);
if (master is PlayerMobile pm)
{
mobile.AllFollowers?.Remove(this);
mobile.AutoStabled?.Remove(this);
pm.RemoveFollower(this);
pm.AutoStabled?.Remove(this);
}
}
else if (m_SummonMaster != null)
{
m_SummonMaster.Followers -= Math.Min(ControlSlots, m_SummonMaster.Followers);
(m_SummonMaster as PlayerMobile)?.AllFollowers?.Remove(this);
}
}
public void AddFollowers()
{
if (m_ControlMaster != null)
var master = m_ControlMaster ?? m_SummonMaster;
if (master != null)
{
m_ControlMaster.Followers += ControlSlots;
if (m_ControlMaster is PlayerMobile pm)
{
pm.AddFollower(this);
}
}
else if (m_SummonMaster != null)
{
m_SummonMaster.Followers += ControlSlots;
if (m_SummonMaster is PlayerMobile pm)
{
pm.AddFollower(this);
}
master.Followers += ControlSlots;
(master as PlayerMobile)?.AddFollower(this);
}
}
@ -3416,8 +3402,6 @@ namespace Server.Mobiles
}
}
RemoveFollowers();
base.OnDeath(c);
if (DeleteCorpseOnDeath)