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

Fixes several more expression issues and cast type check merges.

Browse source
This commit is contained in:
Kamron Batman 2018-09-15 23:31:51 -07:00
parent f93c3b992e
commit 9542c79ea4
24 changed files with 106 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -242,7 +242,7 @@ namespace Server.Factions
IPooledEnumerable<IEntity> eable = mob.Map.GetObjectsInRange(mob.Location, range, items, mobs);
foreach (IEntity obj in eable)
if (type.IsAssignableFrom(obj.GetType()))
if (type.IsInstanceOfType(obj))
{
eable.Free();
return true;

7
Scripts/Engines/Factions/Core/Generator.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Server.Commands;
namespace Server.Factions
@ -68,11 +69,7 @@ namespace Server.Factions
private static bool CheckExistance(Point3D loc, Map facet, Type type)
{
foreach (Item item in facet.GetItemsInRange(loc, 0))
if (type.IsAssignableFrom(item.GetType()))
return true;
return false;
return facet.GetItemsInRange(loc, 0).Any(type.IsInstanceOfType);
}
}
}

2
Scripts/Engines/MLQuests/Objectives/DeliverObjective.cs
View file

@ -136,7 +136,7 @@ namespace Server.Engines.MLQuests.Objectives
{
Type destType = Objective.Destination;
return destType != null && destType.IsAssignableFrom(type);
return destType?.IsAssignableFrom(type) == true;
}
public override bool IsCompleted()