fix(core): Fixes several serialization issues (#355)
- [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:
parent
0888ab9b86
commit
4ddb3de026
162 changed files with 652 additions and 1045 deletions
|
|
@ -38,7 +38,7 @@ namespace Server.Engines.CannedEvil
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Spawn = reader.ReadItem() as ChampionSpawn;
|
||||
m_Spawn = reader.ReadEntity<ChampionSpawn>();
|
||||
|
||||
if (m_Spawn == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -80,7 +80,7 @@ namespace Server.Engines.CannedEvil
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Spawn = reader.ReadItem() as ChampionSpawn;
|
||||
m_Spawn = reader.ReadEntity<ChampionSpawn>();
|
||||
|
||||
if (m_Spawn == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -157,8 +157,8 @@ namespace Server.Engines.CannedEvil
|
|||
case 0:
|
||||
{
|
||||
m_Type = (ChampionSkullType)reader.ReadInt();
|
||||
Platform = reader.ReadItem() as ChampionSkullPlatform;
|
||||
m_Skull = reader.ReadItem();
|
||||
Platform = reader.ReadEntity<ChampionSkullPlatform>();
|
||||
m_Skull = reader.ReadEntity<Item>();
|
||||
|
||||
if (Platform == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -112,12 +112,12 @@ namespace Server.Engines.CannedEvil
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Power = reader.ReadItem() as ChampionSkullBrazier;
|
||||
m_Enlightenment = reader.ReadItem() as ChampionSkullBrazier;
|
||||
m_Venom = reader.ReadItem() as ChampionSkullBrazier;
|
||||
m_Pain = reader.ReadItem() as ChampionSkullBrazier;
|
||||
m_Greed = reader.ReadItem() as ChampionSkullBrazier;
|
||||
m_Death = reader.ReadItem() as ChampionSkullBrazier;
|
||||
m_Power = reader.ReadEntity<ChampionSkullBrazier>();
|
||||
m_Enlightenment = reader.ReadEntity<ChampionSkullBrazier>();
|
||||
m_Venom = reader.ReadEntity<ChampionSkullBrazier>();
|
||||
m_Pain = reader.ReadEntity<ChampionSkullBrazier>();
|
||||
m_Greed = reader.ReadEntity<ChampionSkullBrazier>();
|
||||
m_Death = reader.ReadEntity<ChampionSkullBrazier>();
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1169,7 +1169,7 @@ namespace Server.Engines.CannedEvil
|
|||
}
|
||||
|
||||
writer.Write(ConfinedRoaming);
|
||||
writer.WriteItem(m_Idol);
|
||||
writer.Write(m_Idol);
|
||||
writer.Write(HasBeenAdvanced);
|
||||
writer.Write(m_SpawnArea);
|
||||
|
||||
|
|
@ -1180,11 +1180,14 @@ namespace Server.Engines.CannedEvil
|
|||
|
||||
writer.Write(m_Active);
|
||||
writer.Write((int)m_Type);
|
||||
writer.Write(m_Creatures, true);
|
||||
writer.Write(m_RedSkulls, true);
|
||||
writer.Write(m_WhiteSkulls, true);
|
||||
writer.WriteItem(m_Platform);
|
||||
writer.WriteItem(m_Altar);
|
||||
m_Creatures.Tidy();
|
||||
writer.Write(m_Creatures);
|
||||
m_RedSkulls.Tidy();
|
||||
writer.Write(m_RedSkulls);
|
||||
m_WhiteSkulls.Tidy();
|
||||
writer.Write(m_WhiteSkulls);
|
||||
writer.Write(m_Platform);
|
||||
writer.Write(m_Altar);
|
||||
writer.Write(ExpireDelay);
|
||||
writer.WriteDeltaTime(ExpireTime);
|
||||
writer.Write(Champion);
|
||||
|
|
@ -1218,7 +1221,7 @@ namespace Server.Engines.CannedEvil
|
|||
var entries = reader.ReadInt();
|
||||
for (var i = 0; i < entries; ++i)
|
||||
{
|
||||
var m = reader.ReadMobile();
|
||||
var m = reader.ReadEntity<Mobile>();
|
||||
var damage = reader.ReadInt();
|
||||
|
||||
if (m == null)
|
||||
|
|
@ -1234,7 +1237,7 @@ namespace Server.Engines.CannedEvil
|
|||
case 4:
|
||||
{
|
||||
ConfinedRoaming = reader.ReadBool();
|
||||
m_Idol = reader.ReadItem<IdolOfTheChampion>();
|
||||
m_Idol = reader.ReadEntity<IdolOfTheChampion>();
|
||||
HasBeenAdvanced = reader.ReadBool();
|
||||
|
||||
goto case 3;
|
||||
|
|
@ -1277,14 +1280,14 @@ namespace Server.Engines.CannedEvil
|
|||
|
||||
var active = reader.ReadBool();
|
||||
m_Type = (ChampionSpawnType)reader.ReadInt();
|
||||
m_Creatures = reader.ReadStrongMobileList();
|
||||
m_RedSkulls = reader.ReadStrongItemList();
|
||||
m_WhiteSkulls = reader.ReadStrongItemList();
|
||||
m_Platform = reader.ReadItem<ChampionPlatform>();
|
||||
m_Altar = reader.ReadItem<ChampionAltar>();
|
||||
m_Creatures = reader.ReadEntityList<Mobile>();
|
||||
m_RedSkulls = reader.ReadEntityList<Item>();
|
||||
m_WhiteSkulls = reader.ReadEntityList<Item>();
|
||||
m_Platform = reader.ReadEntity<ChampionPlatform>();
|
||||
m_Altar = reader.ReadEntity<ChampionAltar>();
|
||||
ExpireDelay = reader.ReadTimeSpan();
|
||||
ExpireTime = reader.ReadDeltaTime();
|
||||
Champion = reader.ReadMobile();
|
||||
Champion = reader.ReadEntity<Mobile>();
|
||||
RestartDelay = reader.ReadTimeSpan();
|
||||
|
||||
if (reader.ReadBool())
|
||||
|
|
@ -1384,7 +1387,7 @@ namespace Server.Engines.CannedEvil
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
Spawn = reader.ReadItem() as ChampionSpawn;
|
||||
Spawn = reader.ReadEntity<ChampionSpawn>();
|
||||
|
||||
if (Spawn == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ namespace Server.Items
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Harrower = reader.ReadMobile();
|
||||
m_Harrower = reader.ReadEntity<Mobile>();
|
||||
|
||||
if (m_Harrower == null)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue