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/Items/Addons/AddonComponent.cs
View file

@ -260,7 +260,7 @@ namespace Server.Items
case 1:
case 0:
{
Addon = reader.ReadItem() as BaseAddon;
Addon = reader.ReadEntity<BaseAddon>();
Offset = reader.ReadPoint3D();
Addon?.OnComponentLoaded(this);

2
Projects/UOContent/Items/Addons/AddonContainerComponent.cs
View file

@ -112,7 +112,7 @@ namespace Server.Items
var version = reader.ReadInt();
Addon = reader.ReadItem() as BaseAddonContainer;
Addon = reader.ReadEntity<BaseAddonContainer>();
Offset = reader.ReadPoint3D();
Addon?.OnComponentLoaded(this);

11
Projects/UOContent/Items/Addons/BallotBox.cs
View file

@ -105,8 +105,11 @@ namespace Server.Items
writer.Write(Topic[i]);
}
writer.Write(Yes, true);
writer.Write(No, true);
Yes.Tidy();
writer.Write(Yes);
No.Tidy();
writer.Write(No);
}
public override void Deserialize(IGenericReader reader)
@ -122,8 +125,8 @@ namespace Server.Items
Topic[i] = reader.ReadString();
}
Yes = reader.ReadStrongMobileList();
No = reader.ReadStrongMobileList();
Yes = reader.ReadEntityList<Mobile>();
No = reader.ReadEntityList<Mobile>();
}
private class InternalGump : Gump

4
Projects/UOContent/Items/Addons/BaseAddon.cs
View file

@ -283,7 +283,7 @@ namespace Server.Items
writer.Write(1); // version
writer.WriteItemList(Components);
writer.Write(Components);
}
public override void Deserialize(IGenericReader reader)
@ -297,7 +297,7 @@ namespace Server.Items
case 1:
case 0:
{
Components = reader.ReadStrongItemList<AddonComponent>();
Components = reader.ReadEntityList<AddonComponent>();
break;
}
}

4
Projects/UOContent/Items/Addons/BaseAddonContainer.cs
View file

@ -192,7 +192,7 @@ namespace Server.Items
writer.Write(0); // version
writer.WriteItemList(Components);
writer.Write(Components);
writer.Write((int)m_Resource);
}
@ -202,7 +202,7 @@ namespace Server.Items
var version = reader.ReadInt();
Components = reader.ReadStrongItemList<AddonContainerComponent>();
Components = reader.ReadEntityList<AddonContainerComponent>();
m_Resource = (CraftResource)reader.ReadInt();
AddonComponent.ApplyLightTo(this);

10
Projects/UOContent/Items/Addons/SHTeleporter.cs
View file

@ -115,7 +115,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Active = reader.ReadBool();
m_TeleDest = reader.ReadItem() as SHTeleComponent;
m_TeleDest = reader.ReadEntity<SHTeleComponent>();
TeleOffset = reader.ReadPoint3D();
}
}
@ -302,10 +302,10 @@ namespace Server.Items
External = reader.ReadBool();
UpTele = (SHTeleComponent)reader.ReadItem();
RightTele = (SHTeleComponent)reader.ReadItem();
DownTele = (SHTeleComponent)reader.ReadItem();
LeftTele = (SHTeleComponent)reader.ReadItem();
UpTele = (SHTeleComponent)reader.ReadEntity<Item>();
RightTele = (SHTeleComponent)reader.ReadEntity<Item>();
DownTele = (SHTeleComponent)reader.ReadEntity<Item>();
LeftTele = (SHTeleComponent)reader.ReadEntity<Item>();
}
public class SHTeleporterCreator

4
Projects/UOContent/Items/Addons/SolenAntHole.cs
View file

@ -179,7 +179,7 @@ namespace Server.Items
writer.WriteEncodedInt(0); // version
writer.WriteMobileList(m_Spawned);
writer.Write(m_Spawned);
}
public override void Deserialize(IGenericReader reader)
@ -188,7 +188,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
m_Spawned = reader.ReadStrongMobileList<Mobile>();
m_Spawned = reader.ReadEntityList<Mobile>();
}
}
}

4
Projects/UOContent/Items/Armor/BaseArmor.cs
View file

@ -1233,7 +1233,7 @@ namespace Server.Items
if (GetSaveFlag(flags, SaveFlag.Crafter))
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.Quality))
@ -1394,7 +1394,7 @@ namespace Server.Items
m_ArmorBase = reader.ReadInt();
m_MaxHitPoints = reader.ReadInt();
m_HitPoints = reader.ReadInt();
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
m_Quality = (ArmorQuality)reader.ReadInt();
m_Durability = (ArmorDurabilityLevel)reader.ReadInt();
m_Protection = (ArmorProtectionLevel)reader.ReadInt();

4
Projects/UOContent/Items/Clothing/BaseClothing.cs
View file

@ -1087,7 +1087,7 @@ namespace Server.Items
if (GetSaveFlag(flags, SaveFlag.Crafter))
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.Quality))
@ -1137,7 +1137,7 @@ namespace Server.Items
}
case 1:
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
m_Quality = (ClothingQuality)reader.ReadInt();
break;
}

8
Projects/UOContent/Items/Construction/Ankhs.cs
View file

@ -201,7 +201,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -292,7 +292,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as AnkhWest;
m_Item = reader.ReadEntity<AnkhWest>();
}
}
}
@ -388,7 +388,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
[TypeAlias("Server.Items.AnkhEast+InternalItem")]
@ -481,7 +481,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as AnkhNorth;
m_Item = reader.ReadEntity<AnkhNorth>();
}
}
}

16
Projects/UOContent/Items/Construction/Decorative/DecorativeWeapon.cs
View file

@ -154,7 +154,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -210,7 +210,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as DecorativeSwordNorth;
m_Item = reader.ReadEntity<DecorativeSwordNorth>();
}
}
}
@ -269,7 +269,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -325,7 +325,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as DecorativeSwordWest;
m_Item = reader.ReadEntity<DecorativeSwordWest>();
}
}
}
@ -384,7 +384,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -440,7 +440,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as DecorativeDAxeNorth;
m_Item = reader.ReadEntity<DecorativeDAxeNorth>();
}
}
}
@ -499,7 +499,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -555,7 +555,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as DecorativeDAxeWest;
m_Item = reader.ReadEntity<DecorativeDAxeWest>();
}
}
}

44
Projects/UOContent/Items/Construction/Decorative/Tapestry.cs
View file

@ -54,7 +54,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -110,7 +110,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry1N;
m_Item = reader.ReadEntity<Tapestry1N>();
}
}
}
@ -169,7 +169,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -225,7 +225,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry2N;
m_Item = reader.ReadEntity<Tapestry2N>();
}
}
}
@ -284,7 +284,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -340,7 +340,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry2W;
m_Item = reader.ReadEntity<Tapestry2W>();
}
}
}
@ -399,7 +399,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -455,7 +455,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry3N;
m_Item = reader.ReadEntity<Tapestry3N>();
}
}
}
@ -514,7 +514,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -570,7 +570,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry3W;
m_Item = reader.ReadEntity<Tapestry3W>();
}
}
}
@ -629,7 +629,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -685,7 +685,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry4N;
m_Item = reader.ReadEntity<Tapestry4N>();
}
}
}
@ -744,7 +744,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -800,7 +800,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry4W;
m_Item = reader.ReadEntity<Tapestry4W>();
}
}
}
@ -859,7 +859,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -915,7 +915,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry5N;
m_Item = reader.ReadEntity<Tapestry5N>();
}
}
}
@ -974,7 +974,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -1030,7 +1030,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry5W;
m_Item = reader.ReadEntity<Tapestry5W>();
}
}
}
@ -1089,7 +1089,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -1145,7 +1145,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry6N;
m_Item = reader.ReadEntity<Tapestry6N>();
}
}
}
@ -1204,7 +1204,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item = reader.ReadEntity<InternalItem>();
}
private class InternalItem : Item
@ -1260,7 +1260,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as Tapestry6W;
m_Item = reader.ReadEntity<Tapestry6W>();
}
}
}

2
Projects/UOContent/Items/Construction/Doors/BaseDoor.cs
View file

@ -543,7 +543,7 @@ namespace Server.Items
OpenedSound = reader.ReadInt();
ClosedSound = reader.ReadInt();
Offset = reader.ReadPoint3D();
m_Link = reader.ReadItem() as BaseDoor;
m_Link = reader.ReadEntity<BaseDoor>();
m_Timer = new InternalTimer(this);

4
Projects/UOContent/Items/Containers/Strongbox.cs
View file

@ -70,8 +70,8 @@ namespace Server.Items
{
case 0:
{
m_Owner = reader.ReadMobile();
m_House = reader.ReadItem() as BaseHouse;
m_Owner = reader.ReadEntity<Mobile>();
m_House = reader.ReadEntity<BaseHouse>();
break;
}

12
Projects/UOContent/Items/Containers/TreasureMapChest.cs
View file

@ -414,14 +414,16 @@ namespace Server.Items
writer.Write(2); // version
writer.Write(Guardians, true);
Guardians.Tidy();
writer.Write(Guardians);
writer.Write(Temporary);
writer.Write(Owner);
writer.Write(Level);
writer.WriteDeltaTime(DeleteTime);
writer.Write(m_Lifted, true);
m_Lifted.Tidy();
writer.Write(m_Lifted);
}
public override void Deserialize(IGenericReader reader)
@ -434,14 +436,14 @@ namespace Server.Items
{
case 2:
{
Guardians = reader.ReadStrongMobileList();
Guardians = reader.ReadEntityList<Mobile>();
Temporary = reader.ReadBool();
goto case 1;
}
case 1:
{
Owner = reader.ReadMobile();
Owner = reader.ReadEntity<Mobile>();
goto case 0;
}
@ -449,7 +451,7 @@ namespace Server.Items
{
Level = reader.ReadInt();
DeleteTime = reader.ReadDeltaTime();
m_Lifted = reader.ReadStrongItemList();
m_Lifted = reader.ReadEntityList<Item>();
if (version < 2)
{

2
Projects/UOContent/Items/Decoration Artifacts/StealableArtifactsSpawner.cs
View file

@ -296,7 +296,7 @@ namespace Server.Items
for (var i = 0; i < length; i++)
{
var item = reader.ReadItem();
var item = reader.ReadEntity<Item>();
var nextRespawn = reader.ReadDeltaTime();
if (i < m_Artifacts.Length)

2
Projects/UOContent/Items/Deeds/CommodityDeed.cs
View file

@ -61,7 +61,7 @@ namespace Server.Items
var version = reader.ReadInt();
Commodity = reader.ReadItem();
Commodity = reader.ReadEntity<Item>();
switch (version)
{

2
Projects/UOContent/Items/Deeds/DragonBardingDeed.cs
View file

@ -162,7 +162,7 @@ namespace Server.Items
case 0:
{
m_Exceptional = reader.ReadBool();
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
if (version < 1)
{

2
Projects/UOContent/Items/Deeds/NewPlayerTicket.cs
View file

@ -52,7 +52,7 @@ namespace Server.Items
{
case 0:
{
Owner = reader.ReadMobile();
Owner = reader.ReadEntity<Mobile>();
break;
}
}

2
Projects/UOContent/Items/Food/Beverage.cs
View file

@ -1128,7 +1128,7 @@ namespace Server.Items
{
case 1:
{
Poisoner = reader.ReadMobile();
Poisoner = reader.ReadEntity<Mobile>();
goto case 0;
}
case 0:

2
Projects/UOContent/Items/Food/Food.cs
View file

@ -168,7 +168,7 @@ namespace Server.Items
}
case 4:
{
Poisoner = reader.ReadMobile();
Poisoner = reader.ReadEntity<Mobile>();
goto case 3;
}
}

2
Projects/UOContent/Items/Games/BasePiece.cs
View file

@ -32,7 +32,7 @@ namespace Server.Items
{
case 0:
{
Board = (BaseBoard)reader.ReadItem();
Board = (BaseBoard)reader.ReadEntity<Item>();
if (Board == null || Parent == null)
{

2
Projects/UOContent/Items/Games/Mahjong/MahjongPlayers.cs
View file

@ -41,7 +41,7 @@ namespace Server.Engines.Mahjong
for (var i = 0; i < seats; i++)
{
m_Players[i] = reader.ReadMobile();
m_Players[i] = reader.ReadEntity<Mobile>();
m_PublicHand[i] = reader.ReadBool();
m_Scores[i] = reader.ReadInt();
}

2
Projects/UOContent/Items/Guilds/GuildTeleporter.cs
View file

@ -44,7 +44,7 @@ namespace Server.Items
{
case 0:
{
m_Stone = reader.ReadItem();
m_Stone = reader.ReadEntity<Item>();
break;
}

4
Projects/UOContent/Items/Guilds/Guildstone.cs
View file

@ -136,7 +136,7 @@ namespace Server.Items
}
case 1:
{
Guild = reader.ReadGuild() as Guild;
Guild = reader.ReadEntity<Guild>();
goto case 0;
}
@ -372,7 +372,7 @@ namespace Server.Items
m_GuildName = reader.ReadString();
m_GuildAbbrev = reader.ReadString();
Guild = reader.ReadGuild() as Guild;
Guild = reader.ReadEntity<Guild>();
break;
}

4
Projects/UOContent/Items/Maps/TreasureMap.cs
View file

@ -588,7 +588,7 @@ namespace Server.Items
{
case 1:
{
m_CompletedBy = reader.ReadMobile();
m_CompletedBy = reader.ReadEntity<Mobile>();
goto case 0;
}
@ -596,7 +596,7 @@ namespace Server.Items
{
m_Level = reader.ReadInt();
m_Completed = reader.ReadBool();
m_Decoder = reader.ReadMobile();
m_Decoder = reader.ReadEntity<Mobile>();
m_Map = reader.ReadMap();
ChestLocation = reader.ReadPoint2D();

4
Projects/UOContent/Items/Misc/BulletinBoards.cs
View file

@ -462,12 +462,12 @@ namespace Server.Items
case 1:
case 0:
{
Poster = reader.ReadMobile();
Poster = reader.ReadEntity<Mobile>();
Subject = reader.ReadString();
Time = reader.ReadDateTime();
LastPostTime = reader.ReadDateTime();
var hasThread = reader.ReadBool();
Thread = reader.ReadItem() as BulletinMessage;
Thread = reader.ReadEntity<BulletinMessage>();
PostedName = reader.ReadString();
PostedBody = reader.ReadInt();
PostedHue = reader.ReadInt();

8
Projects/UOContent/Items/Misc/CommunicationCrystals.cs
View file

@ -171,7 +171,7 @@ namespace Server.Items
writer.WriteEncodedInt(0); // version
writer.WriteEncodedInt(m_Charges);
writer.WriteItemList(Receivers);
writer.Write(Receivers);
}
public override void Deserialize(IGenericReader reader)
@ -181,7 +181,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
m_Charges = reader.ReadEncodedInt();
Receivers = reader.ReadStrongItemList<ReceiverCrystal>();
Receivers = reader.ReadEntityList<ReceiverCrystal>();
}
private class InternalTarget : Target
@ -394,7 +394,7 @@ namespace Server.Items
writer.WriteEncodedInt(0); // version
writer.WriteItem(m_Sender);
writer.Write(m_Sender);
}
public override void Deserialize(IGenericReader reader)
@ -403,7 +403,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
m_Sender = reader.ReadItem<BroadcastCrystal>();
m_Sender = reader.ReadEntity<BroadcastCrystal>();
}
private class InternalTarget : Target

26
Projects/UOContent/Items/Misc/Corpses/Corpse.cs
View file

@ -628,7 +628,7 @@ namespace Server.Items
{
if (reader.ReadBool())
{
RestoreEquip = reader.ReadStrongItemList();
RestoreEquip = reader.ReadEntityList<Item>();
}
goto case 11;
@ -644,7 +644,7 @@ namespace Server.Items
for (var i = 0; i < count; ++i)
{
var item = reader.ReadItem();
var item = reader.ReadEntity<Item>();
if (reader.ReadBool())
{
@ -661,11 +661,11 @@ namespace Server.Items
BeginDecay(reader.ReadDeltaTime() - DateTime.UtcNow);
}
Looters = reader.ReadStrongMobileList();
Killer = reader.ReadMobile();
Looters = reader.ReadEntityList<Mobile>();
Killer = reader.ReadEntity<Mobile>();
Aggressors = reader.ReadStrongMobileList();
Owner = reader.ReadMobile();
Aggressors = reader.ReadEntityList<Mobile>();
Owner = reader.ReadEntity<Mobile>();
m_CorpseName = reader.ReadString();
@ -673,7 +673,7 @@ namespace Server.Items
reader.ReadInt(); // guild reserve
Kills = reader.ReadInt();
EquipItems = reader.ReadStrongItemList();
EquipItems = reader.ReadEntityList<Item>();
break;
}
case 10:
@ -688,7 +688,7 @@ namespace Server.Items
for (var i = 0; i < count; ++i)
{
var item = reader.ReadItem();
var item = reader.ReadEntity<Item>();
if (reader.ReadBool())
{
@ -719,8 +719,8 @@ namespace Server.Items
}
case 6:
{
Looters = reader.ReadStrongMobileList();
Killer = reader.ReadMobile();
Looters = reader.ReadEntityList<Mobile>();
Killer = reader.ReadEntity<Mobile>();
goto case 5;
}
@ -732,13 +732,13 @@ namespace Server.Items
}
case 4:
{
Aggressors = reader.ReadStrongMobileList();
Aggressors = reader.ReadEntityList<Mobile>();
goto case 3;
}
case 3:
{
Owner = reader.ReadMobile();
Owner = reader.ReadEntity<Mobile>();
goto case 2;
}
@ -781,7 +781,7 @@ namespace Server.Items
Kills = reader.ReadInt();
SetFlag(CorpseFlag.Criminal, reader.ReadBool());
EquipItems = reader.ReadStrongItemList();
EquipItems = reader.ReadEntityList<Item>();
break;
}

2
Projects/UOContent/Items/Misc/EffectController.cs
View file

@ -245,7 +245,7 @@ namespace Server.Items
m_Source = ReadEntity(reader);
m_Target = ReadEntity(reader);
Sequence = reader.ReadItem() as EffectController;
Sequence = reader.ReadEntity<EffectController>();
FixedDirection = reader.ReadBool();
Explodes = reader.ReadBool();

2
Projects/UOContent/Items/Misc/Key.cs
View file

@ -172,7 +172,7 @@ namespace Server.Items
}
case 1:
{
Link = reader.ReadItem();
Link = reader.ReadEntity<Item>();
goto case 0;
}

4
Projects/UOContent/Items/Misc/KeyRing.cs
View file

@ -155,7 +155,7 @@ namespace Server.Items
writer.WriteEncodedInt(0); // version
writer.WriteItemList(Keys);
writer.Write(Keys);
}
public override void Deserialize(IGenericReader reader)
@ -164,7 +164,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
Keys = reader.ReadStrongItemList<Key>();
Keys = reader.ReadEntityList<Key>();
}
private class InternalTarget : Target

2
Projects/UOContent/Items/Misc/PlayerBulletinBoards.cs
View file

@ -347,7 +347,7 @@ namespace Server.Items
case 0:
{
Time = reader.ReadDateTime();
Poster = reader.ReadMobile();
Poster = reader.ReadEntity<Mobile>();
Message = reader.ReadString();
break;
}

6
Projects/UOContent/Items/Misc/Teleporter.cs
View file

@ -930,7 +930,7 @@ namespace Server.Items
for (var i = 0; i < count; ++i)
{
var m = reader.ReadMobile();
var m = reader.ReadEntity<Mobile>();
var end = reader.ReadDateTime();
StartTimer(m, end - DateTime.UtcNow);
@ -973,7 +973,7 @@ namespace Server.Items
writer.Write(0); // version
writer.WriteItem(Teleporter);
writer.Write(Teleporter);
}
public override void Deserialize(IGenericReader reader)
@ -982,7 +982,7 @@ namespace Server.Items
var version = reader.ReadInt();
Teleporter = reader.ReadItem<TimeoutTeleporter>();
Teleporter = reader.ReadEntity<TimeoutTeleporter>();
}
}

2
Projects/UOContent/Items/Misc/Waypoint.cs
View file

@ -83,7 +83,7 @@ namespace Server.Items
{
case 0:
{
m_Next = reader.ReadItem() as WayPoint;
m_Next = reader.ReadEntity<WayPoint>();
break;
}
}

2
Projects/UOContent/Items/Quivers/BaseQuiver.cs
View file

@ -532,7 +532,7 @@ namespace Server.Items
if (GetSaveFlag(flags, SaveFlag.Crafter))
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.Quality))

2
Projects/UOContent/Items/Resources/Fishing/BigFish.cs
View file

@ -72,7 +72,7 @@ namespace Server.Items
{
case 1:
{
m_Fisher = reader.ReadMobile();
m_Fisher = reader.ReadEntity<Mobile>();
break;
}
case 0:

16
Projects/UOContent/Items/Skill Items/Blacksmith Items/Misc/LargeForge.cs
View file

@ -71,8 +71,8 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item2 = reader.ReadItem() as InternalItem2;
m_Item = reader.ReadEntity<InternalItem>();
m_Item2 = reader.ReadEntity<InternalItem2>();
}
[Forge]
@ -129,7 +129,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as LargeForgeWest;
m_Item = reader.ReadEntity<LargeForgeWest>();
}
}
@ -187,7 +187,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as LargeForgeWest;
m_Item = reader.ReadEntity<LargeForgeWest>();
}
}
}
@ -261,8 +261,8 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as InternalItem;
m_Item2 = reader.ReadItem() as InternalItem2;
m_Item = reader.ReadEntity<InternalItem>();
m_Item2 = reader.ReadEntity<InternalItem2>();
}
[Forge]
@ -319,7 +319,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as LargeForgeEast;
m_Item = reader.ReadEntity<LargeForgeEast>();
}
}
@ -377,7 +377,7 @@ namespace Server.Items
var version = reader.ReadInt();
m_Item = reader.ReadItem() as LargeForgeEast;
m_Item = reader.ReadEntity<LargeForgeEast>();
}
}
}

4
Projects/UOContent/Items/Skill Items/Carpenter Items/TaxidermyKit.cs
View file

@ -293,7 +293,7 @@ namespace Server.Items
{
case 1:
{
m_Hunter = reader.ReadMobile();
m_Hunter = reader.ReadEntity<Mobile>();
m_AnimalWeight = reader.ReadInt();
goto case 0;
}
@ -468,7 +468,7 @@ namespace Server.Items
{
case 1:
{
m_Hunter = reader.ReadMobile();
m_Hunter = reader.ReadEntity<Mobile>();
m_AnimalWeight = reader.ReadInt();
goto case 0;
}

2
Projects/UOContent/Items/Skill Items/Harvest Tools/BaseHarvestTool.cs
View file

@ -203,7 +203,7 @@ namespace Server.Items
{
case 1:
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
m_Quality = (ToolQuality)reader.ReadInt();
goto case 0;
}

2
Projects/UOContent/Items/Skill Items/Magical/Misc/RecallRune.cs
View file

@ -119,7 +119,7 @@ namespace Server.Items
{
case 1:
{
m_House = reader.ReadItem() as BaseHouse;
m_House = reader.ReadEntity<BaseHouse>();
goto case 0;
}
case 0:

2
Projects/UOContent/Items/Skill Items/Magical/Potions/Conflagration Potions/BaseConflagrationPotion.cs
View file

@ -249,7 +249,7 @@ namespace Server.Items
var version = reader.ReadInt();
From = reader.ReadMobile();
From = reader.ReadEntity<Mobile>();
m_End = reader.ReadDateTime();
m_MinDamage = reader.ReadInt();
m_MaxDamage = reader.ReadInt();

4
Projects/UOContent/Items/Skill Items/Magical/Runebook.cs
View file

@ -201,7 +201,7 @@ namespace Server.Items
}
case 2:
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
goto case 1;
}
case 1:
@ -476,7 +476,7 @@ namespace Server.Items
{
case 1:
{
House = reader.ReadItem() as BaseHouse;
House = reader.ReadEntity<BaseHouse>();
goto case 0;
}
case 0:

2
Projects/UOContent/Items/Skill Items/Magical/Spellbook.cs
View file

@ -929,7 +929,7 @@ namespace Server.Items
}
case 3:
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
goto case 2;
}
case 2:

2
Projects/UOContent/Items/Skill Items/Misc/RepairDeed.cs
View file

@ -218,7 +218,7 @@ namespace Server.Items
{
m_Skill = (RepairSkillType)reader.ReadInt();
m_SkillLevel = reader.ReadDouble();
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
break;
}

4
Projects/UOContent/Items/Skill Items/Musical Instruments/BaseInstrument.cs
View file

@ -517,7 +517,7 @@ namespace Server.Items
}
case 2:
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
m_Quality = (InstrumentQuality)reader.ReadEncodedInt();
m_Slayer = (SlayerName)reader.ReadEncodedInt();
@ -532,7 +532,7 @@ namespace Server.Items
}
case 1:
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
m_Quality = (InstrumentQuality)reader.ReadEncodedInt();
m_Slayer = (SlayerName)reader.ReadEncodedInt();

2
Projects/UOContent/Items/Skill Items/Thief/DisguisePersistance.cs
View file

@ -58,7 +58,7 @@ namespace Server.Items
for (var i = 0; i < count; ++i)
{
var m = reader.ReadMobile();
var m = reader.ReadEntity<Mobile>();
DisguiseTimers.CreateTimer(m, reader.ReadTimeSpan());
m.NameMod = reader.ReadString();
}

2
Projects/UOContent/Items/Skill Items/Tools/BaseTool.cs
View file

@ -204,7 +204,7 @@ namespace Server.Items
{
case 1:
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
m_Quality = (ToolQuality)reader.ReadInt();
goto case 0;
}

6
Projects/UOContent/Items/Special/Holiday/Christmas/HolidayTree.cs
View file

@ -151,7 +151,7 @@ namespace Server.Items
{
case 1:
{
Placer = reader.ReadMobile();
Placer = reader.ReadEntity<Mobile>();
goto case 0;
}
@ -163,7 +163,7 @@ namespace Server.Items
for (var i = 0; i < count; ++i)
{
var item = reader.ReadItem();
var item = reader.ReadEntity<Item>();
if (item != null)
{
@ -288,7 +288,7 @@ namespace Server.Items
{
case 0:
{
m_Tree = reader.ReadItem() as HolidayTree;
m_Tree = reader.ReadEntity<HolidayTree>();
if (m_Tree == null)
{

4
Projects/UOContent/Items/Special/House Raffle/HouseRaffleDeed.cs
View file

@ -148,7 +148,7 @@ namespace Server.Items
{
case 1:
{
m_Stone = reader.ReadItem<HouseRaffleStone>();
m_Stone = reader.ReadEntity<HouseRaffleStone>();
goto case 0;
}
@ -156,7 +156,7 @@ namespace Server.Items
{
m_PlotLocation = reader.ReadPoint3D();
m_Facet = reader.ReadMap();
m_AwardedTo = reader.ReadMobile();
m_AwardedTo = reader.ReadEntity<Mobile>();
break;
}

6
Projects/UOContent/Items/Special/House Raffle/HouseRaffleStone.cs
View file

@ -30,7 +30,7 @@ namespace Server.Items
case 1:
case 0:
{
From = reader.ReadMobile();
From = reader.ReadEntity<Mobile>();
Address = Utility.Intern(reader.ReadIPAddress());
Date = reader.ReadDateTime();
@ -640,7 +640,7 @@ namespace Server.Items
}
case 1:
{
Deed = reader.ReadItem<HouseRaffleDeed>();
Deed = reader.ReadEntity<HouseRaffleDeed>();
goto case 0;
}
@ -651,7 +651,7 @@ namespace Server.Items
m_Bounds = reader.ReadRect2D();
m_Facet = reader.ReadMap();
m_Winner = reader.ReadMobile();
m_Winner = reader.ReadEntity<Mobile>();
m_TicketPrice = reader.ReadInt();
m_Started = reader.ReadDateTime();

4
Projects/UOContent/Items/Special/Mutation Core/PlagueBeastInnard.cs
View file

@ -151,7 +151,7 @@ namespace Server.Items
writer.WriteEncodedInt(0); // version
writer.WriteItem(Organ);
writer.Write(Organ);
}
public override void Deserialize(IGenericReader reader)
@ -160,7 +160,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
Organ = reader.ReadItem<PlagueBeastOrgan>();
Organ = reader.ReadEntity<PlagueBeastOrgan>();
}
}
}

6
Projects/UOContent/Items/Special/Mutation Core/PlagueBeastOrgans.cs
View file

@ -90,7 +90,7 @@ namespace Server.Items
writer.WriteEncodedInt(0); // version
writer.WriteItemList(Components);
writer.Write(Components);
writer.Write(BrainHue);
writer.Write(Opened);
}
@ -101,7 +101,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
Components = reader.ReadStrongItemList<PlagueBeastComponent>();
Components = reader.ReadEntityList<PlagueBeastComponent>();
BrainHue = reader.ReadInt();
Opened = reader.ReadBool();
}
@ -466,7 +466,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
m_Gland = reader.ReadItem();
m_Gland = reader.ReadEntity<Item>();
}
}

2
Projects/UOContent/Items/Special/Solen Items/BallOfSummoning.cs
View file

@ -358,7 +358,7 @@ namespace Server.Items
case 0:
{
m_Charges = Math.Min(reader.ReadEncodedInt(), MaxCharges);
Pet = (BaseCreature)reader.ReadMobile();
Pet = (BaseCreature)reader.ReadEntity<Mobile>();
PetName = reader.ReadString();
break;
}

2
Projects/UOContent/Items/Special/Solen Items/BraceletOfBinding.cs
View file

@ -361,7 +361,7 @@ namespace Server.Items
{
m_Charges = Math.Min(reader.ReadEncodedInt(), MaxCharges);
m_Inscription = reader.ReadString();
Bound = (BraceletOfBinding)reader.ReadItem();
Bound = (BraceletOfBinding)reader.ReadEntity<Item>();
break;
}
}

2
Projects/UOContent/Items/Special/Veteran Rewards/Brazier.cs
View file

@ -134,7 +134,7 @@ namespace Server.Items
var version = reader.ReadEncodedInt();
m_IsRewardItem = reader.ReadBool();
m_Fire = reader.ReadItem();
m_Fire = reader.ReadEntity<Item>();
}
}

2
Projects/UOContent/Items/Talismans/BaseTalisman.cs
View file

@ -909,7 +909,7 @@ namespace Server.Items
// Backward compatibility
if (GetSaveFlag(flags, SaveFlag.Owner))
{
BlessedFor = reader.ReadMobile();
BlessedFor = reader.ReadEntity<Mobile>();
}
m_Protection = GetSaveFlag(flags, SaveFlag.Protection)

2
Projects/UOContent/Items/Traps/FlameSpurtTrap.cs
View file

@ -162,7 +162,7 @@ namespace Server.Items
{
case 0:
{
var item = reader.ReadItem();
var item = reader.ReadEntity<Item>();
item?.Delete();

4
Projects/UOContent/Items/Weapons/BaseWeapon.cs
View file

@ -3906,7 +3906,7 @@ namespace Server.Items
if (GetSaveFlag(flags, SaveFlag.Crafter))
{
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.Identified))
@ -4165,7 +4165,7 @@ namespace Server.Items
m_DurabilityLevel = (WeaponDurabilityLevel)reader.ReadInt();
m_Quality = (WeaponQuality)reader.ReadInt();
m_Crafter = reader.ReadMobile();
m_Crafter = reader.ReadEntity<Mobile>();
m_Poison = Poison.Deserialize(reader);
m_PoisonCharges = reader.ReadInt();