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

13
Scripts/Regions/GuardedRegion.cs
View file

@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Xml;
using Server.Commands;
using Server.Mobiles;
@ -171,15 +172,8 @@ namespace Server.Regions
public override void MakeGuard(Mobile focus)
{
BaseGuard useGuard = null;
IPooledEnumerable<BaseGuard> eable = focus.GetMobilesInRange<BaseGuard>(8);
foreach (BaseGuard m in eable)
if (m.Focus == null) // idling
{
useGuard = m;
break;
}
BaseGuard useGuard = eable.FirstOrDefault(m => m.Focus == null);
eable.Free();
@ -193,6 +187,7 @@ namespace Server.Regions
}
catch
{
// ignored
}
}
else
@ -212,7 +207,7 @@ namespace Server.Regions
public override void OnExit(Mobile m)
{
if (IsDisabled())
// if (IsDisabled())
return;
}

6
Scripts/Regions/HouseRegion.cs
View file

@ -34,7 +34,7 @@ namespace Server.Regions
{
BaseHouse house = BaseHouse.FindHouseAt(e.Mobile);
if (house != null && !house.Public && !house.IsFriend(e.Mobile))
if (house?.Public == false && !house.IsFriend(e.Mobile))
e.Mobile.Location = house.BanLocation;
}
@ -47,7 +47,7 @@ namespace Server.Regions
{
int x = house.X;
int y = house.Y;
int z = house.Z;
// int z = house.Z;
Rectangle2D[] houseArea = house.Area;
Rectangle3D[] area = new Rectangle3D[houseArea.Length];
@ -372,4 +372,4 @@ namespace Server.Regions
return base.OnSingleClick(from, o);
}
}
}
}

1
Scripts/Regions/Spawning/SpawnDefinition.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.IO;
using System.Xml;

1
Scripts/Regions/Spawning/SpawnEntry.cs
View file

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Server.Commands;
using Server.Mobiles;

2
Scripts/Regions/Spawning/SpawnPersistence.cs
View file

@ -51,7 +51,7 @@ namespace Server.Regions
{
int id = reader.ReadInt();
SpawnEntry entry = (SpawnEntry)SpawnEntry.Table[id];
SpawnEntry entry = SpawnEntry.Table[id];
if (entry != null)
entry.Deserialize(reader, version);