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

fix(core): Fixes several serialization issues (#355)

Browse source 
- [X] Fixes an issue where a buffer smaller than 8 bytes would not double with enough space in some cases.
- [X] Fixes an issue with dupe copying the savebuffer reference (ugh).
- [X] Streamlines the IGenericWriter API to use better generics.
- [X] Streamlines the IGenericReader API to use better generics.
- [X] Forces `tidying` of a List/HashSet to be done externally since Writers/Readers should not have side effects.
- [X] Fixes an issue where Tidying a list didn't TrimExcess, causing memory leaks.
- [X] Reverted the meaning of `World.Running` to specifically refer to any world state post world loading.
  - NOTE: Do not use this if you want to block on world saves. Instead use checks against `WorldState.Saving` states.
- [X] Fixes an issue with serializing negative DateTime deltas.
- [X] Fixes a potential issue with serializing non-UTC DateTime.

Bumps release version
This commit is contained in:
Kamron Batman 2020-12-23 07:11:41 -08:00 • committed by GitHub
parent 0888ab9b86
commit 4ddb3de026
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
162 changed files with 652 additions and 1045 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Projects/Server/Items/Containers.cs
View file

@ -65,7 +65,7 @@ namespace Server.Items
{
case 0:
{
Owner = reader.ReadMobile();
Owner = reader.ReadEntity<Mobile>();
Opened = reader.ReadBool();
if (Owner == null)

32
Projects/Server/Items/Item.cs
View file

@ -795,20 +795,13 @@ namespace Server
AddNameProperties(list);
}
public BufferWriter SaveBuffer { get; set; }
BufferWriter ISerializable.SaveBuffer { get; set; }
[CommandProperty(AccessLevel.Counselor)]
public Serial Serial { get; }
public int TypeRef { get; }
public void Serialize()
{
SaveBuffer ??= new BufferWriter(true);
SaveBuffer.Reset();
Serialize(SaveBuffer);
}
public virtual void Serialize(IGenericWriter writer)
{
// The item is clean, so let's skip
@ -1039,19 +1032,12 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.Parent))
{
if (m_Parent?.Deleted == false)
{
writer.Write(m_Parent.Serial);
}
else
{
writer.Write(Serial.MinusOne);
}
writer.Write(m_Parent);
}
if (GetSaveFlag(flags, SaveFlag.Items))
{
writer.Write(items, false);
writer.Write(items);
}
if (GetSaveFlag(flags, SaveFlag.IntWeight))
@ -2710,7 +2696,7 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.Items))
{
var items = reader.ReadStrongItemList();
var items = reader.ReadEntityList<Item>();
if (this is Container)
{
@ -2768,17 +2754,17 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.InsuredFor))
/*m_InsuredFor = */
{
reader.ReadMobile();
reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.BlessedFor))
{
AcquireCompactInfo().m_BlessedFor = reader.ReadMobile();
AcquireCompactInfo().m_BlessedFor = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.HeldBy))
{
AcquireCompactInfo().m_HeldBy = reader.ReadMobile();
AcquireCompactInfo().m_HeldBy = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.SavedFlags))
@ -2871,7 +2857,7 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.Items))
{
var items = reader.ReadStrongItemList();
var items = reader.ReadEntityList<Item>();
if (this is Container cont)
{
@ -2994,7 +2980,7 @@ namespace Server
for (var i = 0; i < count; ++i)
{
var item = reader.ReadItem();
var item = reader.ReadEntity<Item>();
if (item != null)
{