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

fix(core): Fixes regions (#642)

Browse source
This commit is contained in:
Kamron Batman 2021-06-04 23:34:22 -07:00 • committed by GitHub
parent 20422e5f11
commit 7ddf2b1a8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Projects/Server/Regions/Region.cs
View file

@ -133,6 +133,8 @@ namespace Server
{
Map = json.GetProperty("map", options, out Map map) ? map : null;
Parent = json.GetProperty("parent", options, out string parent) ? Find(parent, Map) : null;
Name = json.GetProperty("name", options, out string name) ? name : null;
Dynamic = false;
if (Parent == null)
@ -146,9 +148,7 @@ namespace Server
Priority = Parent.Priority;
}
Name = json.GetProperty("name", options, out string name) ? name : null;
Priority = json.GetProperty("priority", options, out int priority) ? priority : 0;
Priority = json.GetProperty("priority", options, out int priority) ? priority : Priority;
Area = json.GetProperty("rects", options, out List<Rectangle3D> rects)
? rects.ToArray()
@ -230,15 +230,8 @@ namespace Server
return 1;
}
var thisPriority = Priority;
var regPriority = reg.Priority;
if (thisPriority != regPriority)
{
return regPriority - thisPriority;
}
return reg.ChildLevel - ChildLevel;
return Priority != regPriority ? reg.Priority - Priority : reg.ChildLevel - ChildLevel;
}
// This is not optimized. Use sparingly

1
Projects/UOContent/Regions/BaseRegion.cs
View file

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Text.Json;
using Server.Buffers;
using Server.Gumps;
using Server.Json;
using Server.Mobiles;

1
Projects/UOContent/Regions/GuardedRegion.cs
View file

@ -5,7 +5,6 @@ using System.Text.Json;
using Server.Json;
using Server.Logging;
using Server.Mobiles;
using Server.Network;
using Server.Utilities;
namespace Server.Regions