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

20
Projects/UOContent/Engines/Doom/GauntletSpawner.cs
View file

@ -405,14 +405,14 @@ namespace Server.Engines.Doom
writer.Write(RegionBounds);
writer.WriteItemList(Traps, false);
writer.Write(Traps);
writer.Write(Creatures, false);
writer.Write(Creatures);
writer.Write(TypeName);
writer.WriteItem(Door);
writer.WriteItem(Addon);
writer.WriteItem(Sequence);
writer.Write(Door);
writer.Write(Addon);
writer.Write(Sequence);
writer.Write((int)m_State);
}
@ -428,7 +428,7 @@ namespace Server.Engines.Doom
case 1:
{
RegionBounds = reader.ReadRect2D();
Traps = reader.ReadStrongItemList<BaseTrap>();
Traps = reader.ReadEntityList<BaseTrap>();
goto case 0;
}
@ -440,12 +440,12 @@ namespace Server.Engines.Doom
RegionBounds = new Rectangle2D(X - 40, Y - 40, 80, 80);
}
Creatures = reader.ReadStrongMobileList();
Creatures = reader.ReadEntityList<Mobile>();
TypeName = reader.ReadString();
Door = reader.ReadItem<BaseDoor>();
Addon = reader.ReadItem<BaseAddon>();
Sequence = reader.ReadItem<GauntletSpawner>();
Door = reader.ReadEntity<BaseDoor>();
Addon = reader.ReadEntity<BaseAddon>();
Sequence = reader.ReadEntity<GauntletSpawner>();
State = (GauntletSpawnerState)reader.ReadInt();

21
Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleController.cs
View file

@ -534,9 +534,16 @@ namespace Server.Engines.Doom
{
base.Serialize(writer);
writer.Write(0); // version
writer.WriteItemList(m_Levers, true);
writer.WriteItemList(m_Statues, true);
writer.WriteItemList(m_Teles, true);
m_Levers.Tidy();
writer.Write(m_Levers);
m_Statues.Tidy();
writer.Write(m_Statues);
m_Teles.Tidy();
writer.Write(m_Teles);
writer.Write(m_Box);
}
@ -546,11 +553,11 @@ namespace Server.Engines.Doom
var version = reader.ReadInt();
m_Levers = reader.ReadStrongItemList();
m_Statues = reader.ReadStrongItemList();
m_Teles = reader.ReadStrongItemList();
m_Levers = reader.ReadEntityList<Item>();
m_Statues = reader.ReadEntityList<Item>();
m_Teles = reader.ReadEntityList<Item>();
m_Box = reader.ReadItem() as LampRoomBox;
m_Box = reader.ReadEntity<LampRoomBox>();
m_Tiles = new List<LeverPuzzleRegion>();
for (var i = 4; i < 9; i++)

6
Projects/UOContent/Engines/Doom/LeverPuzzle/LeverPuzzleItems.cs
View file

@ -66,7 +66,7 @@ namespace Server.Engines.Doom
{
base.Deserialize(reader);
var version = reader.ReadInt();
m_Controller = reader.ReadItem() as LeverPuzzleController;
m_Controller = reader.ReadEntity<LeverPuzzleController>();
}
}
@ -104,7 +104,7 @@ namespace Server.Engines.Doom
{
base.Deserialize(reader);
var version = reader.ReadInt();
m_Controller = reader.ReadItem() as LeverPuzzleController;
m_Controller = reader.ReadEntity<LeverPuzzleController>();
}
}
@ -162,7 +162,7 @@ namespace Server.Engines.Doom
base.Deserialize(reader);
var version = reader.ReadInt();
Code = reader.ReadUShort();
m_Controller = reader.ReadItem() as LeverPuzzleController;
m_Controller = reader.ReadEntity<LeverPuzzleController>();
}
}