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

fix(core): Updates expansion and map configurations (fixes map issues) (#570)

Browse source 
- [X] Adds question about expansion at start of server
- [X] Adds question about client version to determine old have and map diffs
- [X] Adds config setting "maps.enablePre6000Trammel"
- [X] Rearranges some of the loading order.
- [X] Added support for deserializing nullable enums from json

TODO:
Expand the nullable enums deserialization factory to work with any type by pulling the factory and creating an instance of the converter.
This commit is contained in:
Kamron Batman 2021-04-14 01:45:18 -07:00 • committed by GitHub
parent 151eef470f
commit 98ce65083a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 324 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Projects/UOContent/Items/Books/BaseBook.cs
View file

@ -78,7 +78,7 @@ namespace Server.Items
[CommandProperty(AccessLevel.GameMaster)]
public int PagesCount => Pages.Length;
public BookPageInfo[] Pages { get; private set; }
public BookPageInfo[] Pages { get; protected set; }
public virtual BookContent DefaultContent => null;
@ -230,14 +230,7 @@ namespace Server.Items
}
else
{
if (content != null)
{
Pages = content.Copy();
}
else
{
Pages = Array.Empty<BookPageInfo>();
}
Pages = content?.Copy() ?? Array.Empty<BookPageInfo>();
}
break;
@ -262,14 +255,7 @@ namespace Server.Items
{
var content = DefaultContent;
if (content != null)
{
Pages = content.Copy();
}
else
{
Pages = Array.Empty<BookPageInfo>();
}
Pages = content?.Copy() ?? Array.Empty<BookPageInfo>();
}
break;