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/UOContent/Engines/CannedEvil/ChampionAltar.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/CannedEvil/ChampionPlatform.cs
View file

@ -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)
{

4
Projects/UOContent/Engines/CannedEvil/ChampionSkullBrazier.cs
View file

@ -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)
{

12
Projects/UOContent/Engines/CannedEvil/ChampionSkullPlatform.cs
View file

@ -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;
}

33
Projects/UOContent/Engines/CannedEvil/ChampionSpawn.cs
View file

@ -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)
{

2
Projects/UOContent/Engines/CannedEvil/HarrowerGate.cs
View file

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

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)

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>();
}
}

6
Projects/UOContent/Engines/Ethics/Core/Player.cs
View file

@ -32,13 +32,13 @@ namespace Server.Ethics
{
case 0:
{
Mobile = reader.ReadMobile();
Mobile = reader.ReadEntity<Mobile>();
Power = reader.ReadEncodedInt();
History = reader.ReadEncodedInt();
Steed = reader.ReadMobile();
Familiar = reader.ReadMobile();
Steed = reader.ReadEntity<Mobile>();
Familiar = reader.ReadEntity<Mobile>();
m_Shield = reader.ReadDeltaTime();

8
Projects/UOContent/Engines/Factions/Core/Election.cs
View file

@ -426,7 +426,7 @@ namespace Server.Factions
{
case 0:
{
From = reader.ReadMobile();
From = reader.ReadEntity<Mobile>();
Address = Utility.Intern(reader.ReadIPAddress());
Time = reader.ReadDateTime();
@ -498,7 +498,7 @@ namespace Server.Factions
{
case 1:
{
Mobile = reader.ReadMobile();
Mobile = reader.ReadEntity<Mobile>();
var count = reader.ReadEncodedInt();
Voters = new List<Voter>(count);
@ -517,9 +517,9 @@ namespace Server.Factions
}
case 0:
{
Mobile = reader.ReadMobile();
Mobile = reader.ReadEntity<Mobile>();
var mobs = reader.ReadStrongMobileList();
var mobs = reader.ReadEntityList<Mobile>();
Voters = new List<Voter>(mobs.Count);
for (var i = 0; i < mobs.Count; ++i)

2
Projects/UOContent/Engines/Factions/Core/FactionItem.cs
View file

@ -25,7 +25,7 @@ namespace Server.Factions
{
case 0:
{
Item = reader.ReadItem();
Item = reader.ReadEntity<Item>();
Expiration = reader.ReadDateTime();
break;
}

4
Projects/UOContent/Engines/Factions/Core/FactionState.cs
View file

@ -61,7 +61,7 @@ namespace Server.Factions
{
m_Faction = Faction.ReadReference(reader);
m_Commander = reader.ReadMobile();
m_Commander = reader.ReadEntity<Mobile>();
if (version < 5)
{
@ -136,7 +136,7 @@ namespace Server.Factions
for (var i = 0; i < factionTrapCount; ++i)
{
if (reader.ReadItem() is BaseFactionTrap trap && !trap.CheckDecay())
if (reader.ReadEntity<Item>() is BaseFactionTrap trap && !trap.CheckDecay())
{
Traps.Add(trap);
}

2
Projects/UOContent/Engines/Factions/Core/PlayerState.cs
View file

@ -43,7 +43,7 @@ namespace Server.Factions
}
case 0:
{
Mobile = reader.ReadMobile();
Mobile = reader.ReadEntity<Mobile>();
m_KillPoints = reader.ReadEncodedInt();
m_MerchantTitle = (MerchantTitle)reader.ReadEncodedInt();

4
Projects/UOContent/Engines/Factions/Core/TownState.cs
View file

@ -39,8 +39,8 @@ namespace Server.Factions
Town = Town.ReadReference(reader);
Owner = Faction.ReadReference(reader);
m_Sheriff = reader.ReadMobile();
m_Finance = reader.ReadMobile();
m_Sheriff = reader.ReadEntity<Mobile>();
m_Finance = reader.ReadEntity<Mobile>();
Town.State = this;

2
Projects/UOContent/Engines/Factions/Items/BaseMonolith.cs
View file

@ -128,7 +128,7 @@ namespace Server.Factions
{
Town = Town.ReadReference(reader);
Faction = Faction.ReadReference(reader);
m_Sigil = reader.ReadItem() as Sigil;
m_Sigil = reader.ReadEntity<Sigil>();
break;
}
}

2
Projects/UOContent/Engines/Factions/Items/Sigil.cs
View file

@ -429,7 +429,7 @@ namespace Server.Factions
m_Corrupted = Faction.ReadReference(reader);
m_Corrupting = Faction.ReadReference(reader);
LastMonolith = reader.ReadItem() as BaseMonolith;
LastMonolith = reader.ReadEntity<BaseMonolith>();
LastStolen = reader.ReadDateTime();
GraceStart = reader.ReadDateTime();

2
Projects/UOContent/Engines/Factions/Items/Traps/BaseFactionTrap.cs
View file

@ -255,7 +255,7 @@ namespace Server.Factions
var version = reader.ReadInt();
Faction = Faction.ReadReference(reader);
Placer = reader.ReadMobile();
Placer = reader.ReadEntity<Mobile>();
TimeOfPlacement = reader.ReadDateTime();
if (Visible)

2
Projects/UOContent/Engines/Factions/Mobiles/Guards/BaseFactionGuard.cs
View file

@ -522,7 +522,7 @@ namespace Server.Factions
var version = reader.ReadInt();
Rider = reader.ReadMobile();
Rider = reader.ReadEntity<Mobile>();
if (Rider == null)
{

2
Projects/UOContent/Engines/Factions/Mobiles/Guards/Orders.cs
View file

@ -74,7 +74,7 @@ namespace Server.Factions.AI
{
case 1:
{
Follow = reader.ReadMobile();
Follow = reader.ReadEntity<Mobile>();
goto case 0;
}
case 0:

2
Projects/UOContent/Engines/Khaldun/PuzzleChest.cs
View file

@ -589,7 +589,7 @@ namespace Server.Items
var guesses = reader.ReadEncodedInt();
for (var i = 0; i < guesses; i++)
{
var m = reader.ReadMobile();
var m = reader.ReadEntity<Mobile>();
var sol = new PuzzleChestSolutionAndTime(reader);
m_Guesses[m] = sol;

2
Projects/UOContent/Engines/Khaldun/RaiseSwitch.cs
View file

@ -119,7 +119,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
RaisableItem = (RaisableItem)reader.ReadItem();
RaisableItem = (RaisableItem)reader.ReadEntity<Item>();
Reset();
}

4
Projects/UOContent/Engines/MLQuests/MLQuestContext.cs
View file

@ -31,7 +31,7 @@ namespace Server.Engines.MLQuests
public MLQuestContext(IGenericReader reader, int version)
{
Owner = reader.ReadMobile<PlayerMobile>();
Owner = reader.ReadEntity<PlayerMobile>();
QuestInstances = new List<MLQuestInstance>();
m_DoneQuests = new List<MLDoneQuestInfo>();
ChainOffers = new List<MLQuest>();
@ -234,7 +234,7 @@ namespace Server.Engines.MLQuests
{
// Version info is written in MLQuestPersistence.Serialize
writer.WriteMobile(Owner);
writer.Write(Owner);
writer.Write(QuestInstances.Count);
foreach (var instance in QuestInstances)

2
Projects/UOContent/Engines/Quests/Dark Tides/Items/MaabusCoffin.cs
View file

@ -100,7 +100,7 @@ namespace Server.Engines.Quests.Necro
var version = reader.ReadInt();
Maabus = reader.ReadMobile() as Maabus;
Maabus = reader.ReadEntity<Maabus>();
SpawnLocation = reader.ReadPoint3D();
Sleep();

2
Projects/UOContent/Engines/Quests/Dark Tides/Mobiles/SummonedPaladin.cs
View file

@ -150,7 +150,7 @@ namespace Server.Engines.Quests.Necro
var version = reader.ReadInt();
m_Necromancer = reader.ReadMobile() as PlayerMobile;
m_Necromancer = reader.ReadEntity<PlayerMobile>();
m_ToDelete = reader.ReadBool();
if (m_ToDelete)

2
Projects/UOContent/Engines/Quests/Study of the Solen Hive/StudyOfSolenQuest.cs
View file

@ -41,7 +41,7 @@ namespace Server.Engines.Quests.Naturalist
{
var version = reader.ReadEncodedInt();
Naturalist = (Naturalist)reader.ReadMobile();
Naturalist = (Naturalist)reader.ReadEntity<Mobile>();
}
public override void ChildSerialize(IGenericWriter writer)

4
Projects/UOContent/Engines/Quests/The Summoning/Items/BellOfTheDead.cs
View file

@ -126,8 +126,8 @@ namespace Server.Engines.Quests.Doom
var version = reader.ReadInt();
Chyloth = reader.ReadMobile() as Chyloth;
Dragon = reader.ReadMobile() as SkeletalDragon;
Chyloth = reader.ReadEntity<Chyloth>();
Dragon = reader.ReadEntity<SkeletalDragon>();
Chyloth?.Delete();
}

2
Projects/UOContent/Engines/Quests/The Summoning/Items/SummoningAltar.cs
View file

@ -54,7 +54,7 @@ namespace Server.Engines.Quests.Doom
var version = reader.ReadInt();
m_Daemon = reader.ReadMobile() as BoneDemon;
m_Daemon = reader.ReadEntity<BoneDemon>();
CheckDaemon();
}

4
Projects/UOContent/Engines/Quests/The Summoning/Objectives.cs
View file

@ -173,8 +173,8 @@ namespace Server.Engines.Quests.Doom
{
var version = reader.ReadEncodedInt();
m_Daemon = reader.ReadMobile() as BoneDemon;
CorpseWithSkull = reader.ReadItem() as Corpse;
m_Daemon = reader.ReadEntity<BoneDemon>();
CorpseWithSkull = reader.ReadEntity<Corpse>();
}
public override void ChildSerialize(IGenericWriter writer)

2
Projects/UOContent/Engines/Quests/The Summoning/TheSummoningQuest.cs
View file

@ -105,7 +105,7 @@ namespace Server.Engines.Quests.Doom
{
var version = reader.ReadEncodedInt();
Victoria = reader.ReadMobile() as Victoria;
Victoria = reader.ReadEntity<Victoria>();
WaitForSummon = reader.ReadBool();
}

2
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/Cannon.cs
View file

@ -133,7 +133,7 @@ namespace Server.Engines.Quests.Haven
var version = reader.ReadInt();
CannonDirection = (CannonDirection)reader.ReadEncodedInt();
Canoneer = (MilitiaCanoneer)reader.ReadMobile();
Canoneer = (MilitiaCanoneer)reader.ReadEntity<Mobile>();
}
}

2
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Items/SchmendrickApprenticeCorpse.cs
View file

@ -205,7 +205,7 @@ namespace Server.Engines.Quests.Haven
var version = reader.ReadInt();
m_Lantern = (Lantern)reader.ReadItem();
m_Lantern = (Lantern)reader.ReadEntity<Item>();
}
}
}

2
Projects/UOContent/Engines/Quests/Uzeraan Turmoil/Objectives.cs
View file

@ -429,7 +429,7 @@ namespace Server.Engines.Quests.Haven
{
var version = reader.ReadEncodedInt();
CorpseWithBone = (Container)reader.ReadItem();
CorpseWithBone = (Container)reader.ReadEntity<Item>();
}
public override void ChildSerialize(IGenericWriter writer)

2
Projects/UOContent/Engines/Quests/Witch Apprentice/Objectives.cs
View file

@ -90,7 +90,7 @@ namespace Server.Engines.Quests.Hag
}
case 0:
{
Corpse = (Corpse)reader.ReadItem();
Corpse = (Corpse)reader.ReadEntity<Item>();
break;
}
}

32
Projects/UOContent/Engines/Spawners/BaseSpawner.cs
View file

@ -981,7 +981,7 @@ namespace Server.Engines.Spawners
case 3:
case 2:
{
WayPoint = reader.ReadItem() as WayPoint;
WayPoint = reader.ReadEntity<WayPoint>();
goto case 1;
}
@ -1040,23 +1040,27 @@ namespace Server.Engines.Spawners
for (var i = 0; i < count; ++i)
{
if (reader.ReadEntity() is ISpawnable e)
var e = reader.ReadEntity<ISpawnable>();
if (e == null)
{
if (e is BaseCreature creature)
{
creature.RemoveIfUntamed = true;
}
continue;
}
e.Spawner = this;
if (e is BaseCreature creature)
{
creature.RemoveIfUntamed = true;
}
for (var j = 0; j < Entries.Count; j++)
e.Spawner = this;
for (var j = 0; j < Entries.Count; j++)
{
if (AssemblyHandler.FindFirstTypeForName(Entries[j].SpawnedName) == e.GetType())
{
if (AssemblyHandler.FindFirstTypeForName(Entries[j].SpawnedName) == e.GetType())
{
Entries[j].Spawned.Add(e);
Spawned.Add(e, Entries[j]);
break;
}
Entries[j].Spawned.Add(e);
Spawned.Add(e, Entries[j]);
break;
}
}
}

4
Projects/UOContent/Engines/Spawners/SpawnerEntry.cs
View file

@ -32,7 +32,9 @@ namespace Server.Engines.Spawners
for (var i = 0; i < count; ++i)
{
if (reader.ReadEntity() is ISpawnable e)
var e = reader.ReadEntity<ISpawnable>();
if (e != null)
{
e.Spawner = parent;

6
Projects/UOContent/Engines/VeteranRewards/Character Statue Maker/CharacterStatue.cs
View file

@ -233,10 +233,10 @@ namespace Server.Mobiles
m_Pose = (StatuePose)reader.ReadInt();
m_Material = (StatueMaterial)reader.ReadInt();
m_SculptedBy = reader.ReadMobile();
m_SculptedBy = reader.ReadEntity<Mobile>();
SculptedOn = reader.ReadDateTime();
Plinth = reader.ReadItem() as CharacterStatuePlinth;
Plinth = reader.ReadEntity<CharacterStatuePlinth>();
IsRewardItem = reader.ReadBool();
InvalidatePose();
@ -581,7 +581,7 @@ namespace Server.Mobiles
m_Type = (StatueType)reader.ReadInt();
}
Statue = reader.ReadMobile() as CharacterStatue;
Statue = reader.ReadEntity<CharacterStatue>();
m_IsRewardItem = reader.ReadBool();
}
}

2
Projects/UOContent/Engines/VeteranRewards/Character Statue Maker/CharacterStatuePlinth.cs
View file

@ -97,7 +97,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
m_Statue = reader.ReadMobile() as CharacterStatue;
m_Statue = reader.ReadEntity<CharacterStatue>();
if (m_Statue?.SculptedBy == null || Map == Map.Internal)
{