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:
Kamron Batman
GitHub
parent
0888ab9b86
commit
4ddb3de026
162 changed files with 652 additions and 1045 deletions
|
|
@ -2844,8 +2844,10 @@ namespace Server.Multis
|
|||
|
||||
writer.Write(m_RelativeBanLocation);
|
||||
|
||||
writer.WriteItemList(VendorRentalContracts, true);
|
||||
writer.WriteMobileList(InternalizedVendors, true);
|
||||
VendorRentalContracts.Tidy();
|
||||
writer.Write(VendorRentalContracts);
|
||||
InternalizedVendors.Tidy();
|
||||
writer.Write(InternalizedVendors);
|
||||
|
||||
writer.WriteEncodedInt(RelocatedEntities.Count);
|
||||
foreach (var relEntity in RelocatedEntities)
|
||||
|
|
@ -2876,12 +2878,13 @@ namespace Server.Multis
|
|||
|
||||
writer.Write(Price);
|
||||
|
||||
writer.WriteMobileList(Access);
|
||||
writer.Write(Access);
|
||||
|
||||
writer.Write(BuiltOn);
|
||||
writer.Write(LastTraded);
|
||||
|
||||
writer.WriteItemList(Addons, true);
|
||||
Addons.Tidy();
|
||||
writer.Write(Addons);
|
||||
|
||||
writer.Write(Secures.Count);
|
||||
|
||||
|
|
@ -2897,21 +2900,20 @@ namespace Server.Multis
|
|||
writer.Write(m_Owner);
|
||||
|
||||
// Version 5 no longer serializes region coords
|
||||
/*writer.Write( (int)m_Region.Coords.Count );
|
||||
foreach( Rectangle2D rect in m_Region.Coords )
|
||||
{
|
||||
writer.Write( rect );
|
||||
}*/
|
||||
|
||||
writer.WriteMobileList(CoOwners, true);
|
||||
writer.WriteMobileList(Friends, true);
|
||||
writer.WriteMobileList(Bans, true);
|
||||
CoOwners.Tidy();
|
||||
writer.Write(CoOwners);
|
||||
Friends.Tidy();
|
||||
writer.Write(Friends);
|
||||
Bans.Tidy();
|
||||
writer.Write(Bans);
|
||||
|
||||
writer.Write(Sign);
|
||||
writer.Write(m_Trash);
|
||||
|
||||
writer.WriteItemList(Doors, true);
|
||||
writer.WriteItemList(LockDowns, true);
|
||||
Doors.Tidy();
|
||||
writer.Write(Doors);
|
||||
LockDowns.Tidy();
|
||||
writer.Write(LockDowns);
|
||||
// writer.WriteItemList( m_Secures, true );
|
||||
|
||||
writer.Write(MaxLockDowns);
|
||||
|
|
@ -2971,8 +2973,8 @@ namespace Server.Multis
|
|||
case 13: // removed ban location serialization
|
||||
case 12:
|
||||
{
|
||||
VendorRentalContracts = reader.ReadStrongItemList<VendorRentalContract>();
|
||||
InternalizedVendors = reader.ReadStrongMobileList();
|
||||
VendorRentalContracts = reader.ReadEntityList<VendorRentalContract>();
|
||||
InternalizedVendors = reader.ReadEntityList<Mobile>();
|
||||
|
||||
var relocatedCount = reader.ReadEncodedInt();
|
||||
for (var i = 0; i < relocatedCount; i++)
|
||||
|
|
@ -3014,7 +3016,7 @@ namespace Server.Multis
|
|||
}
|
||||
case 7:
|
||||
{
|
||||
Access = reader.ReadStrongMobileList();
|
||||
Access = reader.ReadEntityList<Mobile>();
|
||||
goto case 6;
|
||||
}
|
||||
case 6:
|
||||
|
|
@ -3026,7 +3028,7 @@ namespace Server.Multis
|
|||
case 5: // just removed fields
|
||||
case 4:
|
||||
{
|
||||
Addons = reader.ReadStrongItemList();
|
||||
Addons = reader.ReadEntityList<Item>();
|
||||
goto case 3;
|
||||
}
|
||||
case 3:
|
||||
|
|
@ -3089,7 +3091,7 @@ namespace Server.Multis
|
|||
Price = DefaultPrice;
|
||||
}
|
||||
|
||||
m_Owner = reader.ReadMobile();
|
||||
m_Owner = reader.ReadEntity<Mobile>();
|
||||
|
||||
if (version < 5)
|
||||
{
|
||||
|
|
@ -3103,15 +3105,15 @@ namespace Server.Multis
|
|||
|
||||
UpdateRegion();
|
||||
|
||||
CoOwners = reader.ReadStrongMobileList();
|
||||
Friends = reader.ReadStrongMobileList();
|
||||
Bans = reader.ReadStrongMobileList();
|
||||
CoOwners = reader.ReadEntityList<Mobile>();
|
||||
Friends = reader.ReadEntityList<Mobile>();
|
||||
Bans = reader.ReadEntityList<Mobile>();
|
||||
|
||||
Sign = reader.ReadItem() as HouseSign;
|
||||
m_Trash = reader.ReadItem() as TrashBarrel;
|
||||
Sign = reader.ReadEntity<HouseSign>();
|
||||
m_Trash = reader.ReadEntity<TrashBarrel>();
|
||||
|
||||
Doors = reader.ReadStrongItemList<BaseDoor>();
|
||||
LockDowns = reader.ReadStrongItemList();
|
||||
Doors = reader.ReadEntityList<BaseDoor>();
|
||||
LockDowns = reader.ReadEntityList<Item>();
|
||||
|
||||
for (var i = 0; i < LockDowns.Count; ++i)
|
||||
{
|
||||
|
|
@ -3125,7 +3127,7 @@ namespace Server.Multis
|
|||
|
||||
if (version < 3)
|
||||
{
|
||||
var items = reader.ReadStrongItemList();
|
||||
var items = reader.ReadEntityList<Item>();
|
||||
Secures = new List<SecureInfo>(items.Count);
|
||||
|
||||
for (var i = 0; i < items.Count; ++i)
|
||||
|
|
@ -3849,7 +3851,7 @@ namespace Server.Multis
|
|||
|
||||
public SecureInfo(IGenericReader reader)
|
||||
{
|
||||
Item = reader.ReadItem() as Container;
|
||||
Item = reader.ReadEntity<Container>();
|
||||
Level = (SecureLevel)reader.ReadByte();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -329,7 +329,7 @@ namespace Server.Multis
|
|||
{
|
||||
case 3:
|
||||
{
|
||||
MapItem = (MapItem)reader.ReadItem();
|
||||
MapItem = (MapItem)reader.ReadEntity<Item>();
|
||||
NextNavPoint = reader.ReadInt();
|
||||
|
||||
goto case 2;
|
||||
|
|
@ -373,11 +373,11 @@ namespace Server.Multis
|
|||
}
|
||||
}
|
||||
|
||||
Owner = reader.ReadMobile();
|
||||
PPlank = reader.ReadItem() as Plank;
|
||||
SPlank = reader.ReadItem() as Plank;
|
||||
TillerMan = reader.ReadItem() as TillerMan;
|
||||
Hold = reader.ReadItem() as Hold;
|
||||
Owner = reader.ReadEntity<Mobile>();
|
||||
PPlank = reader.ReadEntity<Plank>();
|
||||
SPlank = reader.ReadEntity<Plank>();
|
||||
TillerMan = reader.ReadEntity<TillerMan>();
|
||||
Hold = reader.ReadEntity<Hold>();
|
||||
Anchored = reader.ReadBool();
|
||||
m_ShipName = reader.ReadString();
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ namespace Server.Items
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Boat = reader.ReadItem() as BaseBoat;
|
||||
m_Boat = reader.ReadEntity<BaseBoat>();
|
||||
|
||||
if (m_Boat == null || Parent != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ namespace Server.Items
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
Boat = reader.ReadItem() as BaseBoat;
|
||||
Boat = reader.ReadEntity<BaseBoat>();
|
||||
Side = (PlankSide)reader.ReadInt();
|
||||
Locked = reader.ReadBool();
|
||||
KeyValue = reader.ReadUInt();
|
||||
|
|
|
|||
|
|
@ -116,7 +116,7 @@ namespace Server.Items
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Boat = reader.ReadItem() as BaseBoat;
|
||||
m_Boat = reader.ReadEntity<BaseBoat>();
|
||||
|
||||
if (m_Boat == null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -159,8 +159,10 @@ namespace Server.Multis
|
|||
|
||||
writer.Write(0); // version
|
||||
|
||||
writer.Write(m_Items, true);
|
||||
writer.Write(m_Mobiles, true);
|
||||
m_Items.Tidy();
|
||||
writer.Write(m_Items);
|
||||
m_Mobiles.Tidy();
|
||||
writer.Write(m_Mobiles);
|
||||
writer.WriteDeltaTime(m_DecayTime);
|
||||
}
|
||||
|
||||
|
|
@ -174,8 +176,8 @@ namespace Server.Multis
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Items = reader.ReadStrongItemList();
|
||||
m_Mobiles = reader.ReadStrongMobileList();
|
||||
m_Items = reader.ReadEntityList<Item>();
|
||||
m_Mobiles = reader.ReadEntityList<Mobile>();
|
||||
m_DecayTime = reader.ReadDeltaTime();
|
||||
|
||||
RefreshDecay(false);
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ namespace Server.Multis
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Prisoner = reader.ReadMobile();
|
||||
m_Prisoner = reader.ReadEntity<Mobile>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,7 +190,7 @@ namespace Server.Multis
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Prisoner = reader.ReadMobile();
|
||||
m_Prisoner = reader.ReadEntity<Mobile>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -192,13 +192,13 @@ namespace Server.Multis
|
|||
{
|
||||
case 1:
|
||||
{
|
||||
m_Prisoner = reader.ReadMobile();
|
||||
m_Prisoner = reader.ReadEntity<Mobile>();
|
||||
break;
|
||||
}
|
||||
case 0:
|
||||
{
|
||||
m_Prisoner = reader.ReadMobile();
|
||||
reader.ReadItem();
|
||||
m_Prisoner = reader.ReadEntity<Mobile>();
|
||||
reader.ReadEntity<Item>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -190,13 +190,13 @@ namespace Server.Multis
|
|||
{
|
||||
case 1:
|
||||
{
|
||||
m_Prisoner = reader.ReadMobile();
|
||||
m_Prisoner = reader.ReadEntity<Mobile>();
|
||||
break;
|
||||
}
|
||||
case 0:
|
||||
{
|
||||
m_Prisoner = reader.ReadMobile();
|
||||
reader.ReadItem();
|
||||
m_Prisoner = reader.ReadEntity<Mobile>();
|
||||
reader.ReadEntity<Item>();
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -221,7 +221,8 @@ namespace Server.Multis
|
|||
|
||||
if (Fixtures != null)
|
||||
{
|
||||
writer.WriteItemList(Fixtures, true);
|
||||
Fixtures.Tidy();
|
||||
writer.Write(Fixtures);
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -240,7 +241,7 @@ namespace Server.Multis
|
|||
|
||||
for (var i = 0; i < count; i++)
|
||||
{
|
||||
AddFixture(reader.ReadItem());
|
||||
AddFixture(reader.ReadEntity<Item>());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -908,7 +908,8 @@ namespace Server.Multis
|
|||
writer.Write(SignHanger);
|
||||
|
||||
writer.Write(LastRevision);
|
||||
writer.Write(Fixtures, true);
|
||||
Fixtures.Tidy();
|
||||
writer.Write(Fixtures);
|
||||
|
||||
CurrentState.Serialize(writer);
|
||||
DesignState.Serialize(writer);
|
||||
|
|
@ -926,7 +927,7 @@ namespace Server.Multis
|
|||
case 5:
|
||||
case 4:
|
||||
{
|
||||
Signpost = reader.ReadItem();
|
||||
Signpost = reader.ReadEntity<Item>();
|
||||
SignpostGraphic = reader.ReadInt();
|
||||
|
||||
goto case 3;
|
||||
|
|
@ -939,7 +940,7 @@ namespace Server.Multis
|
|||
}
|
||||
case 2:
|
||||
{
|
||||
SignHanger = reader.ReadItem();
|
||||
SignHanger = reader.ReadEntity<Item>();
|
||||
|
||||
goto case 1;
|
||||
}
|
||||
|
|
@ -965,7 +966,7 @@ namespace Server.Multis
|
|||
}
|
||||
|
||||
LastRevision = reader.ReadInt();
|
||||
Fixtures = reader.ReadStrongItemList();
|
||||
Fixtures = reader.ReadEntityList<Item>();
|
||||
|
||||
m_Current = new DesignState(this, reader);
|
||||
m_Design = new DesignState(this, reader);
|
||||
|
|
|
|||
|
|
@ -216,8 +216,8 @@ namespace Server.Multis
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
Owner = reader.ReadItem() as BaseHouse;
|
||||
OriginalOwner = reader.ReadMobile();
|
||||
Owner = reader.ReadEntity<BaseHouse>();
|
||||
OriginalOwner = reader.ReadEntity<Mobile>();
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -90,7 +90,7 @@ namespace Server.Items
|
|||
}
|
||||
case 0:
|
||||
{
|
||||
Target = reader.ReadItem();
|
||||
Target = reader.ReadEntity<Item>();
|
||||
|
||||
if (version < 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ namespace Server.Multis
|
|||
public override void AddNameProperties( ObjectPropertyList list )
|
||||
{
|
||||
base.AddNameProperties( list );
|
||||
|
||||
|
||||
if (House != null && House.InternalizedVendors.Count > 0)
|
||||
list.Add( 1061833, House.InternalizedVendors.Count.ToString() ); // This packing crate contains ~1_COUNT~ vendors/barkeepers.
|
||||
}
|
||||
|
|
@ -248,7 +248,7 @@ namespace Server.Multis
|
|||
|
||||
var version = reader.ReadEncodedInt();
|
||||
|
||||
House = reader.ReadItem() as BaseHouse;
|
||||
House = reader.ReadEntity<BaseHouse>();
|
||||
|
||||
if (House != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -120,7 +120,7 @@ namespace Server.Multis
|
|||
{
|
||||
case 0:
|
||||
{
|
||||
m_Components = reader.ReadStrongItemList();
|
||||
m_Components = reader.ReadEntityList<Item>();
|
||||
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue