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

Modernization Fixes & Updates to Default Values (#3)

Browse source
This commit is contained in:
Kamron Batman 2018-10-28 00:33:16 -07:00 • committed by GitHub
parent 445eddff68
commit dcf64091b1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
768 changed files with 10507 additions and 14196 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scripts/Regions/GuardedRegion.cs
View file

@ -77,7 +77,7 @@ namespace Server.Regions
private static void CheckGuarded_OnCommand(CommandEventArgs e)
{
Mobile from = e.Mobile;
GuardedRegion reg = (GuardedRegion)from.Region.GetRegion(typeof(GuardedRegion));
GuardedRegion reg = from.Region.GetRegion<GuardedRegion>();
if (reg == null)
from.SendMessage("You are not in a guardable region.");
@ -95,7 +95,7 @@ namespace Server.Regions
if (e.Length == 1)
{
GuardedRegion reg = (GuardedRegion)from.Region.GetRegion(typeof(GuardedRegion));
GuardedRegion reg = from.Region.GetRegion<GuardedRegion>();
if (reg == null)
{
@ -122,7 +122,7 @@ namespace Server.Regions
private static void ToggleGuarded_OnCommand(CommandEventArgs e)
{
Mobile from = e.Mobile;
GuardedRegion reg = (GuardedRegion)from.Region.GetRegion(typeof(GuardedRegion));
GuardedRegion reg = from.Region.GetRegion<GuardedRegion>();
if (reg == null)
{
@ -342,7 +342,7 @@ namespace Server.Regions
public bool IsGuardCandidate(Mobile m)
{
if (m is BaseGuard || !m.Alive || m.AccessLevel > AccessLevel.Player || m.Blessed ||
m is BaseCreature && ((BaseCreature)m).IsInvulnerable || IsDisabled())
m is BaseCreature creature && creature.IsInvulnerable || IsDisabled())
return false;
return !AllowReds && m.Kills >= 5 || m.Criminal;