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

10
Projects/UOContent/Engines/ConPVP/Arena.cs
View file

@ -263,14 +263,14 @@ namespace Server.Engines.ConPVP
}
case 6:
{
Ladder = reader.ReadItem() as LadderController;
Ladder = reader.ReadEntity<LadderController>();
goto case 5;
}
case 5:
{
m_Tournament = reader.ReadItem() as TournamentController;
Announcer = reader.ReadMobile();
m_Tournament = reader.ReadEntity<TournamentController>();
Announcer = reader.ReadEntity<Mobile>();
goto case 4;
}
@ -290,13 +290,13 @@ namespace Server.Engines.ConPVP
{
GateIn = reader.ReadPoint3D();
m_GateOut = reader.ReadPoint3D();
Teleporter = reader.ReadItem();
Teleporter = reader.ReadEntity<Item>();
goto case 1;
}
case 1:
{
Players = reader.ReadStrongMobileList();
Players = reader.ReadEntityList<Mobile>();
goto case 0;
}

2
Projects/UOContent/Engines/ConPVP/DuelContext.cs
View file

@ -2747,7 +2747,7 @@ namespace Server.Engines.ConPVP
for (var i = 0; i < count; ++i)
{
var mob = reader.ReadMobile();
var mob = reader.ReadEntity<Mobile>();
var loc = reader.ReadPoint3D();
var map = reader.ReadMap();

4
Projects/UOContent/Engines/ConPVP/Games/BombingRun.cs
View file

@ -1380,10 +1380,10 @@ namespace Server.Engines.ConPVP
{
case 0:
{
Board = ip.ReadItem() as BRBoard;
Board = ip.ReadEntity<BRBoard>();
TeamName = ip.ReadString();
Color = ip.ReadEncodedInt();
m_Goal = ip.ReadItem() as BRGoal;
m_Goal = ip.ReadEntity<BRGoal>();
break;
}
}

4
Projects/UOContent/Engines/ConPVP/Games/CTF.cs
View file

@ -665,7 +665,7 @@ namespace Server.Engines.ConPVP
{
case 2:
{
Board = ip.ReadItem() as CTFBoard;
Board = ip.ReadEntity<CTFBoard>();
goto case 1;
}
@ -679,7 +679,7 @@ namespace Server.Engines.ConPVP
{
Color = ip.ReadEncodedInt();
Flag = ip.ReadItem() as CTFFlag;
Flag = ip.ReadEntity<CTFFlag>();
Origin = ip.ReadPoint3D();
break;
}

6
Projects/UOContent/Engines/ConPVP/Games/DoubleDom.cs
View file

@ -311,7 +311,7 @@ namespace Server.Engines.ConPVP
{
case 0:
{
Board = ip.ReadItem() as DDBoard;
Board = ip.ReadEntity<DDBoard>();
TeamName = ip.ReadString();
Color = ip.ReadEncodedInt();
Origin = ip.ReadPoint3D();
@ -481,8 +481,8 @@ namespace Server.Engines.ConPVP
TeamInfo[i] = new DDTeamInfo(i, reader);
}
PointA = reader.ReadItem() as DDWayPoint;
PointB = reader.ReadItem() as DDWayPoint;
PointA = reader.ReadEntity<DDWayPoint>();
PointB = reader.ReadEntity<DDWayPoint>();
break;
}

9
Projects/UOContent/Engines/ConPVP/Games/KingOfTheHill.cs
View file

@ -354,7 +354,7 @@ namespace Server.Engines.ConPVP
{
case 0:
{
m_Controller = reader.ReadItem() as KHController;
m_Controller = reader.ReadEntity<KHController>();
break;
}
}
@ -814,7 +814,8 @@ namespace Server.Engines.ConPVP
writer.WriteEncodedInt(m_ScoreInterval);
writer.Write(Duration);
writer.WriteItemList(Boards, true);
Boards.Tidy();
writer.Write(Boards);
writer.WriteEncodedInt(Hills.Length);
for (var i = 0; i < Hills.Length; ++i)
@ -843,12 +844,12 @@ namespace Server.Engines.ConPVP
Duration = reader.ReadTimeSpan();
Boards = reader.ReadStrongItemList<KHBoard>();
Boards = reader.ReadEntityList<KHBoard>();
Hills = new HillOfTheKing[reader.ReadEncodedInt()];
for (var i = 0; i < Hills.Length; ++i)
{
Hills[i] = reader.ReadItem() as HillOfTheKing;
Hills[i] = reader.ReadEntity<HillOfTheKing>();
}
TeamInfo = new KHTeamInfo[reader.ReadEncodedInt()];

2
Projects/UOContent/Engines/ConPVP/Gumps/LadderGump.cs
View file

@ -38,7 +38,7 @@ namespace Server.Engines.ConPVP
{
case 1:
{
Ladder = reader.ReadItem<LadderController>();
Ladder = reader.ReadEntity<LadderController>();
break;
}
}

2
Projects/UOContent/Engines/ConPVP/Ladder.cs
View file

@ -337,7 +337,7 @@ namespace Server.Engines.ConPVP
case 1:
case 0:
{
Mobile = reader.ReadMobile();
Mobile = reader.ReadEntity<Mobile>();
m_Experience = reader.ReadEncodedInt();
Wins = reader.ReadEncodedInt();
Losses = reader.ReadEncodedInt();

2
Projects/UOContent/Engines/ConPVP/Preferences.cs
View file

@ -149,7 +149,7 @@ namespace Server.Engines.ConPVP
{
case 0:
{
Mobile = reader.ReadMobile();
Mobile = reader.ReadEntity<Mobile>();
var count = reader.ReadEncodedInt();

2
Projects/UOContent/Engines/ConPVP/Tournament.cs
View file

@ -61,7 +61,7 @@ namespace Server.Engines.ConPVP
}
case 4:
{
EventController = reader.ReadItem() as EventController;
EventController = reader.ReadEntity<EventController>();
goto case 3;
}

2
Projects/UOContent/Engines/ConPVP/TournamentBracketItem.cs
View file

@ -53,7 +53,7 @@ namespace Server.Engines.ConPVP
{
case 0:
{
Tournament = reader.ReadItem() as TournamentController;
Tournament = reader.ReadEntity<TournamentController>();
break;
}
}

2
Projects/UOContent/Engines/ConPVP/TournamentRegistrar.cs
View file

@ -98,7 +98,7 @@ namespace Server.Engines.ConPVP
{
case 0:
{
Tournament = reader.ReadItem() as TournamentController;
Tournament = reader.ReadEntity<TournamentController>();
break;
}
}

4
Projects/UOContent/Engines/ConPVP/TournamentSignupItem.cs
View file

@ -187,8 +187,8 @@ namespace Server.Engines.ConPVP
{
case 0:
{
Tournament = reader.ReadItem() as TournamentController;
Registrar = reader.ReadMobile();
Tournament = reader.ReadEntity<TournamentController>();
Registrar = reader.ReadEntity<Mobile>();
break;
}
}

2
Projects/UOContent/Engines/ConPVP/Trophy.cs
View file

@ -70,7 +70,7 @@ namespace Server.Items
Title = reader.ReadString();
m_Rank = (TrophyRank)reader.ReadInt();
Owner = reader.ReadMobile();
Owner = reader.ReadEntity<Mobile>();
Date = reader.ReadDateTime();
if (version == 0)