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

Clean up: Bugs, LINQ, constructors, default values, and null checks (#18)

Browse source
This commit is contained in:
Kamron Batman 2019-03-11 14:29:59 -07:00 • committed by GitHub
parent e748af4430
commit 513e54f70e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1094 changed files with 15913 additions and 21892 deletions
Download patch file Download diff file Expand all files Collapse all files

37
Scripts/Engines/Factions/Core/Faction.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Accounting;
using Server.Commands;
using Server.Commands.Generic;
@ -239,36 +240,18 @@ namespace Server.Factions
return false;
IPooledEnumerable<IEntity> eable = mob.Map.GetObjectsInRange(mob.Location, range, items, mobs);
foreach (IEntity obj in eable)
if (type.IsInstanceOfType(obj))
{
eable.Free();
return true;
}
bool isInstance = eable.Any(type.IsInstanceOfType);
eable.Free();
return false;
return isInstance;
}
public static bool IsNearType(Mobile mob, Type[] types, int range)
{
IPooledEnumerable<IEntity> eable = mob.GetObjectsInRange(range);
foreach (IEntity obj in eable)
{
Type objType = obj.GetType();
for (int i = 0; i < types.Length; i++)
if (types[i].IsAssignableFrom(objType))
{
eable.Free();
return true;
}
}
bool found = eable.Any(obj => types.Any(t => t.IsInstanceOfType(obj)));
eable.Free();
return false;
return found;
}
public void RemovePlayerState(PlayerState pl)
@ -475,7 +458,7 @@ namespace Server.Factions
pm.SendLocalizedMessage(
1042161); // You cannot join a faction because your guild is an Order or Chaos type.
}
else if (!Guild.NewGuildSystem && guild.Enemies != null && guild.Enemies.Count > 0
else if (!Guild.NewGuildSystem && guild.Enemies?.Count > 0
) //CAN join w/wars in new system
{
pm.SendLocalizedMessage(1005056); // You cannot join a faction with active Wars
@ -1016,7 +999,7 @@ namespace Server.Factions
Player killerEPL = Player.Find(killer);
Player victimEPL = Player.Find(victim);
if (killerEPL != null && victimEPL != null && victimEPL.Power > 0 && victimState.CanGiveSilverTo(killer))
if (killerEPL != null && victimEPL?.Power > 0 && victimState.CanGiveSilverTo(killer))
{
int powerTransfer = Math.Max(1, victimEPL.Power / 5);
@ -1078,7 +1061,7 @@ namespace Server.Factions
Player killerEPL = Player.Find(killer);
Player victimEPL = Player.Find(victim);
if (killerEPL != null && victimEPL != null && victimEPL.Power > 0)
if (killerEPL != null && victimEPL?.Power > 0)
{
int powerTransfer = Math.Max(1, victimEPL.Power / 5);
@ -1385,4 +1368,4 @@ namespace Server.Factions
}
}
}
}
}