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

fix: Eliminates double lookup with Contains->Remove (#2539)

Browse source
This commit is contained in:
Kamron Batman 2026-07-19 09:26:27 -07:00 • committed by GitHub
parent e12cc5dd83
commit 8d88ef70fd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 25 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Projects/UOContent/Engines/Factions/Core/FactionItem.cs
View file

@ -87,10 +87,7 @@ public class FactionItem
item.FactionItemState = null;
}
if (Faction?.State.FactionItems.Contains(this) == true)
{
Faction.State.FactionItems.Remove(this);
}
Faction?.State.FactionItems.Remove(this);
}
public void Serialize(IGenericWriter writer)

24
Projects/UOContent/Engines/Factions/Core/Town.cs
View file

@ -350,28 +350,8 @@ public abstract class Town : IComparable<Town>
return true;
}
public bool UnregisterGuard(BaseFactionGuard guard)
{
if (guard == null)
{
return false;
}
var guardList = FindGuardList(guard.GetType());
if (guardList == null)
{
return false;
}
if (!guardList.Guards.Contains(guard))
{
return false;
}
guardList.Guards.Remove(guard);
return true;
}
public bool UnregisterGuard(BaseFactionGuard guard) =>
guard != null && FindGuardList(guard.GetType())?.Guards.Remove(guard) == true;
public bool RegisterVendor(BaseFactionVendor vendor)
{

6
Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -252,11 +252,7 @@ public abstract class BaseFactionTrap : BaseTrap
public override void OnDelete()
{
if (Faction?.Traps.Contains(this) == true)
{
Faction.Traps.Remove(this);
}
Faction?.Traps.Remove(this);
base.OnDelete();
}

3
Projects/UOContent/Engines/Party/Party.cs
View file

@ -123,9 +123,8 @@ namespace Server.Engines.PartySystem
{
from.SendMessage("They are not in a party.");
}
else if (p.m_Listeners.Contains(from))
else if (p.m_Listeners.Remove(from))
{
p.m_Listeners.Remove(from);
from.SendMessage("You are no longer listening to that party.");
}
else

2
Projects/UOContent/Engines/Party/PartyCommands.cs
View file

@ -40,7 +40,7 @@ namespace Server.Engines.PartySystem
from.SendLocalizedMessage(1005455); // Who would you like to remove from your party?
from.Target = new RemovePartyTarget();
}
else if ((p.Leader == from || from == target) && p.Contains(target))
else if (p.Leader == from || from == target)
{
p.Remove(target);
}

13
Projects/UOContent/Gumps/AdminGump.cs
View file

@ -1865,17 +1865,14 @@ namespace Server.Gumps
{
var acct = (Account)m_List[v];
if (info.IsSwitched(v))
{
if (!rads.Contains(acct))
{
rads.Add(acct);
}
}
else if (rads.Contains(acct))
if (!info.IsSwitched(v))
{
rads.Remove(acct);
}
else if (!rads.Contains(acct))
{
rads.Add(acct);
}
}
}
}

7
Projects/UOContent/Gumps/Base/Legacy/Gump.cs
View file

@ -226,13 +226,10 @@ public class Gump : BaseGump
public void Remove(GumpEntry g)
{
if (g == null || !Entries.Contains(g))
if (g != null && Entries.Remove(g))
{
return;
g.Parent = null;
}
Entries.Remove(g);
g.Parent = null;
}
public int Intern(string value)

4
Projects/UOContent/Items/Guilds/Guildstone.cs
View file

@ -54,15 +54,13 @@ public partial class Guildstone : Item, IAddon, IChoppable
var house = BaseHouse.FindHouseAt(this);
if (house?.IsOwner(from) == true && house.Addons.Contains(this))
if (house?.IsOwner(from) == true && house.Addons.Remove(this))
{
Effects.PlaySound(GetWorldLocation(), Map, 0x3B3);
from.SendLocalizedMessage(500461); // You destroy the item.
Delete();
house.Addons.Remove(this);
var deed = Deed;
if (deed != null)

11
Projects/UOContent/Misc/Guild.cs
View file

@ -191,7 +191,7 @@ namespace Server.Guilds
public void TurnToMember(Guild g)
{
if (g.Alliance != this || !m_PendingMembers.Contains(g) || m_Members.Contains(g))
if (g.Alliance != this || m_Members.Contains(g) || !m_PendingMembers.Remove(g))
{
return;
}
@ -199,21 +199,16 @@ namespace Server.Guilds
g.GuildMessage(1070760, Name); // Your Guild has joined the ~1_ALLIANCENAME~ Alliance.
AllianceMessage(1070761, g.Name); // A new Guild has joined your Alliance: ~1_GUILDNAME~
m_PendingMembers.Remove(g);
m_Members.Add(g);
g.Alliance.InvalidateMemberProperties();
}
public void RemoveGuild(Guild g)
{
if (m_PendingMembers.Contains(g))
{
m_PendingMembers.Remove(g);
}
m_PendingMembers.Remove(g);
if (m_Members.Contains(g)) // Sanity, just incase someone with a custom script adds a character to BOTH arrays
if (m_Members.Remove(g)) // Sanity, just incase someone with a custom script adds a character to BOTH arrays
{
m_Members.Remove(g);
g.InvalidateMemberProperties();
g.GuildMessage(1070763, Name); // Your Guild has been removed from the ~1_ALLIANCENAME~ Alliance.

13
Projects/UOContent/Misc/Notoriety.cs
View file

@ -477,17 +477,8 @@ namespace Server.Misc
return Notoriety.Enemy;
}
if (Stealing.ClassicMode && pmTarg?.PermaFlags.Contains(source) == true)
{
return Notoriety.CanBeAttacked;
}
if (bcTarg?.AlwaysAttackable == true)
{
return Notoriety.CanBeAttacked;
}
if (CheckHouseFlag(source, target, target.Location, target.Map))
if (Stealing.ClassicMode && pmTarg?.PermaFlags.Contains(source) == true ||
bcTarg?.AlwaysAttackable == true || CheckHouseFlag(source, target, target.Location, target.Map))
{
return Notoriety.CanBeAttacked;
}

3
Projects/UOContent/Mobiles/Vendors/NPC/AnimalTrainer.cs
View file

@ -152,7 +152,8 @@ namespace Server.Mobiles
public void EndClaimList(Mobile from, BaseCreature pet)
{
if (pet?.Deleted != false || from.Map != Map || from is not PlayerMobile pm || pm.Stabled?.Contains(pet) != true || !from.CheckAlive())
if (pet?.Deleted != false || from.Map != Map || from is not PlayerMobile pm
|| pm.Stabled?.Contains(pet) != true || !from.CheckAlive())
{
return;
}

12
Projects/UOContent/Multis/Houses/BaseHouse.cs
View file

@ -2642,10 +2642,8 @@ namespace Server.Multis
return;
}
if (Access.Contains(targ))
if (Access.Remove(targ))
{
Access.Remove(targ);
if (!HasAccess(targ) && IsInside(targ))
{
targ.Location = BanLocation;
@ -2800,10 +2798,8 @@ namespace Server.Multis
return;
}
if (CoOwners.Contains(targ))
if (CoOwners.Remove(targ))
{
CoOwners.Remove(targ);
targ.Delta(MobileDelta.Noto);
from.SendLocalizedMessage(501299); // Co-owner removed from list.
@ -2872,10 +2868,8 @@ namespace Server.Multis
return;
}
if (Friends.Contains(targ))
if (Friends.Remove(targ))
{
Friends.Remove(targ);
targ.Delta(MobileDelta.Noto);
from.SendLocalizedMessage(501298); // Friend removed from list.