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

12
Projects/Server/Guild.cs
View file

@ -1,4 +1,5 @@
using System.Collections.Generic;
using System.IO;
using System.Linq;
namespace Server.Guilds
@ -30,19 +31,14 @@ namespace Server.Guilds
public abstract bool Disbanded { get; }
public abstract void Delete();
public BufferWriter SaveBuffer { get; set; }
public bool Deleted => Disbanded;
[CommandProperty(AccessLevel.Counselor)]
public Serial Serial { get; }
public int TypeRef => 0;
BufferWriter ISerializable.SaveBuffer { get; set; }
public void Serialize()
{
SaveBuffer ??= new BufferWriter(true);
SaveBuffer.Reset();
Serialize(SaveBuffer);
}
public int TypeRef => 0;
public abstract void Serialize(IGenericWriter writer);
public abstract void Deserialize(IGenericReader reader);

8
Projects/Server/IEntity.cs
View file

@ -45,8 +45,10 @@ namespace Server
Deleted = false;
}
public BufferWriter SaveBuffer { get; set; }
BufferWriter ISerializable.SaveBuffer { get; set; }
public int TypeRef { get; } = -1;
public Serial Serial { get; }
public Point3D Location { get; private set; }
@ -97,10 +99,6 @@ namespace Server
&& p.Y >= Location.m_Y - range
&& p.Y <= Location.m_Y + range;
public void Serialize()
{
}
public void Deserialize(IGenericReader reader)
{
// Should not actually be saved

2
Projects/Server/Items/Containers.cs
View file

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

32
Projects/Server/Items/Item.cs
View file

@ -795,20 +795,13 @@ namespace Server
AddNameProperties(list);
}
public BufferWriter SaveBuffer { get; set; }
BufferWriter ISerializable.SaveBuffer { get; set; }
[CommandProperty(AccessLevel.Counselor)]
public Serial Serial { get; }
public int TypeRef { get; }
public void Serialize()
{
SaveBuffer ??= new BufferWriter(true);
SaveBuffer.Reset();
Serialize(SaveBuffer);
}
public virtual void Serialize(IGenericWriter writer)
{
// The item is clean, so let's skip
@ -1039,19 +1032,12 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.Parent))
{
if (m_Parent?.Deleted == false)
{
writer.Write(m_Parent.Serial);
}
else
{
writer.Write(Serial.MinusOne);
}
writer.Write(m_Parent);
}
if (GetSaveFlag(flags, SaveFlag.Items))
{
writer.Write(items, false);
writer.Write(items);
}
if (GetSaveFlag(flags, SaveFlag.IntWeight))
@ -2710,7 +2696,7 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.Items))
{
var items = reader.ReadStrongItemList();
var items = reader.ReadEntityList<Item>();
if (this is Container)
{
@ -2768,17 +2754,17 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.InsuredFor))
/*m_InsuredFor = */
{
reader.ReadMobile();
reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.BlessedFor))
{
AcquireCompactInfo().m_BlessedFor = reader.ReadMobile();
AcquireCompactInfo().m_BlessedFor = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.HeldBy))
{
AcquireCompactInfo().m_HeldBy = reader.ReadMobile();
AcquireCompactInfo().m_HeldBy = reader.ReadEntity<Mobile>();
}
if (GetSaveFlag(flags, SaveFlag.SavedFlags))
@ -2871,7 +2857,7 @@ namespace Server
if (GetSaveFlag(flags, SaveFlag.Items))
{
var items = reader.ReadStrongItemList();
var items = reader.ReadEntityList<Item>();
if (this is Container cont)
{
@ -2994,7 +2980,7 @@ namespace Server
for (var i = 0; i < count; ++i)
{
var item = reader.ReadItem();
var item = reader.ReadEntity<Item>();
if (item != null)
{

24
Projects/Server/Mobiles/Mobile.cs
View file

@ -2567,20 +2567,13 @@ namespace Server
AddNameProperties(list);
}
public BufferWriter SaveBuffer { get; set; }
BufferWriter ISerializable.SaveBuffer { get; set; }
[CommandProperty(AccessLevel.Counselor)]
public Serial Serial { get; }
public int TypeRef { get; }
public void Serialize()
{
SaveBuffer ??= new BufferWriter(true);
SaveBuffer.Reset();
Serialize(SaveBuffer);
}
public virtual void Serialize(IGenericWriter writer)
{
// The item is clean, so let's skip
@ -2628,7 +2621,8 @@ namespace Server
writer.Write(CreationTime);
writer.Write(Stabled, true);
Stabled.Tidy();
writer.Write(Stabled);
writer.Write(CantWalk);
@ -6393,7 +6387,7 @@ namespace Server
case 25:
case 24:
{
Corpse = reader.ReadItem() as Container;
Corpse = reader.ReadEntity<Container>();
goto case 23;
}
@ -6406,7 +6400,7 @@ namespace Server
case 22: // Just removed followers
case 21:
{
Stabled = reader.ReadStrongMobileList();
Stabled = reader.ReadEntityList<Mobile>();
goto case 20;
}
@ -6461,13 +6455,13 @@ namespace Server
}
case 13:
{
GuildFealty = reader.ReadMobile();
GuildFealty = reader.ReadEntity<Mobile>();
goto case 12;
}
case 12:
{
m_Guild = reader.ReadGuild();
m_Guild = reader.ReadEntity<BaseGuild>();
goto case 11;
}
@ -6491,7 +6485,7 @@ namespace Server
}
case 8:
{
m_Holding = reader.ReadItem();
m_Holding = reader.ReadEntity<Item>();
goto case 7;
}
@ -6599,7 +6593,7 @@ namespace Server
Skills = new Skills(this, reader);
Items = reader.ReadStrongItemList();
Items = reader.ReadEntityList<Item>();
m_Player = reader.ReadBool();
m_Title = reader.ReadString();

162
Projects/Server/Serialization/BufferReader.cs
View file

@ -43,41 +43,21 @@ namespace Server
}
var length = ReadEncodedInt();
var s = length == 0 ? "" : _encoding.GetString(_buffer.AsSpan(Position, length));
if (length <= 0)
{
return "";
}
var s = _encoding.GetString(_buffer.AsSpan(Position, length));
Position += length;
return s;
}
public DateTime ReadDateTime() => new(ReadLong());
public DateTimeOffset ReadDateTimeOffset() => new(ReadLong(), ReadTimeSpan());
public DateTime ReadDateTime() => new(ReadLong(), DateTimeKind.Utc);
public TimeSpan ReadTimeSpan() => new(ReadLong());
public DateTime ReadDeltaTime()
{
var ticks = ReadLong();
var now = DateTime.UtcNow.Ticks;
if (ticks > 0 && ticks + now < 0)
{
return DateTime.MaxValue;
}
if (ticks < 0 && ticks + now < 0)
{
return DateTime.MinValue;
}
try
{
return new DateTime(now + ticks);
}
catch
{
return ticks > 0 ? DateTime.MaxValue : DateTime.MinValue;
}
}
public DateTime ReadDeltaTime() => new(ReadLong() + DateTime.UtcNow.Ticks, DateTimeKind.Utc);
public decimal ReadDecimal() => new(new[] { ReadInt(), ReadInt(), ReadInt(), ReadInt() });
@ -177,27 +157,20 @@ namespace Server
public Map ReadMap() => Map.Maps[ReadByte()];
public IEntity ReadEntity()
public T ReadEntity<T>() where T : class, ISerializable
{
Serial serial = ReadUInt();
return World.FindEntity(serial) ?? new Entity(serial, new Point3D(0, 0, 0), Map.Internal);
// Special case for now:
if (typeof(T).IsAssignableTo(typeof(BaseGuild)))
{
return World.FindGuild(serial) as T;
}
return World.FindEntity(serial) as T;
}
public Item ReadItem() => World.FindItem(ReadUInt());
public Mobile ReadMobile() => World.FindMobile(ReadUInt());
public BaseGuild ReadGuild() => World.FindGuild(ReadUInt());
public T ReadItem<T>() where T : Item => ReadItem() as T;
public T ReadMobile<T>() where T : Mobile => ReadMobile() as T;
public T ReadGuild<T>() where T : BaseGuild => ReadGuild() as T;
public List<Item> ReadStrongItemList() => ReadStrongItemList<Item>();
public List<T> ReadStrongItemList<T>() where T : Item
public List<T> ReadEntityList<T>() where T : class, ISerializable
{
var count = ReadInt();
@ -205,108 +178,28 @@ namespace Server
for (var i = 0; i < count; ++i)
{
if (ReadItem() is T item)
var entity = ReadEntity<T>();
if (entity != null)
{
list.Add(item);
list.Add(entity);
}
}
return list;
}
public HashSet<Item> ReadItemSet() => ReadItemSet<Item>();
public HashSet<T> ReadItemSet<T>() where T : Item
public HashSet<T> ReadEntitySet<T>() where T : class, ISerializable
{
var count = ReadInt();
var set = new HashSet<T>();
var set = new HashSet<T>(count);
for (var i = 0; i < count; ++i)
{
if (ReadItem() is T item)
var entity = ReadEntity<T>();
if (entity != null)
{
set.Add(item);
}
}
return set;
}
public List<Mobile> ReadStrongMobileList() => ReadStrongMobileList<Mobile>();
public List<T> ReadStrongMobileList<T>() where T : Mobile
{
var count = ReadInt();
var list = new List<T>(count);
for (var i = 0; i < count; ++i)
{
if (ReadMobile() is T m)
{
list.Add(m);
}
}
return list;
}
public HashSet<Mobile> ReadMobileSet() => ReadMobileSet<Mobile>();
public HashSet<T> ReadMobileSet<T>() where T : Mobile
{
var count = ReadInt();
var set = new HashSet<T>();
for (var i = 0; i < count; ++i)
{
if (ReadMobile() is T item)
{
set.Add(item);
}
}
return set;
}
public List<BaseGuild> ReadStrongGuildList() => ReadStrongGuildList<BaseGuild>();
public List<T> ReadStrongGuildList<T>() where T : BaseGuild
{
var count = ReadInt();
var list = new List<T>(count);
if (count > 0)
{
for (var i = 0; i < count; ++i)
{
if (ReadGuild() is T g)
{
list.Add(g);
}
}
}
return list;
}
public HashSet<BaseGuild> ReadGuildSet() => ReadGuildSet<BaseGuild>();
public HashSet<T> ReadGuildSet<T>() where T : BaseGuild
{
var count = ReadInt();
var set = new HashSet<T>();
if (count > 0)
{
for (var i = 0; i < count; ++i)
{
if (ReadGuild() is T item)
{
set.Add(item);
}
set.Add(entity);
}
}
@ -332,10 +225,9 @@ namespace Server
{
return origin switch
{
SeekOrigin.Begin => Position = offset,
SeekOrigin.Current => Position += offset,
SeekOrigin.End => Position = _buffer.Length - offset,
_ => Position
_ => Position = offset // Begin
};
}
}

443
Projects/Server/Serialization/BufferWriter.cs
View file

@ -19,7 +19,6 @@ using System.IO;
using System.Net;
using System.Runtime.CompilerServices;
using System.Text;
using Server.Guilds;
namespace Server
{
@ -45,6 +44,13 @@ namespace Server
_buffer = GC.AllocateUninitializedArray<byte>(BufferSize);
}
public BufferWriter(int count, bool prefixStr)
{
m_PrefixStrings = prefixStr;
m_Encoding = Utility.UTF8;
_buffer = GC.AllocateUninitializedArray<byte>(count);
}
public virtual long Position => Index;
protected virtual int BufferSize => 256;
@ -69,21 +75,22 @@ namespace Server
public virtual void Flush()
{
Resize(_buffer.Length * 2);
// Need to avoid buffer.Length = 2, buffer * 2 is 4, but we need 8 or 16bytes, causing an exception.
// The least we need is 16bytes + Index, but we use BufferSize since it should always be big enough for a single
// non-dynamic field.
Resize(Math.Max(BufferSize, _buffer.Length * 2));
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
private void FlushIfNeeded(int amount)
private bool FlushIfNeeded(int amount)
{
if (Index + amount > _buffer.Length)
{
Flush();
return true;
}
}
public void Reset()
{
Index = 0;
return false;
}
public void Write(ReadOnlySpan<byte> bytes)
@ -94,6 +101,7 @@ namespace Server
while (remaining > 0)
{
FlushIfNeeded(remaining);
var count = Math.Min((int)(_buffer.Length - Index), remaining);
bytes.Slice(idx, count).CopyTo(_buffer.AsSpan((int)Index, count));
@ -107,10 +115,9 @@ namespace Server
{
return origin switch
{
SeekOrigin.Begin => Index = offset,
SeekOrigin.Current => Index += offset,
SeekOrigin.End => Index = BufferSize - offset,
_ => Index
SeekOrigin.End => Index = _buffer.Length - offset,
_ => Index = offset // Begin
};
}
@ -133,11 +140,11 @@ namespace Server
{
if (value == null)
{
Write((byte)0);
Write(false);
}
else
{
Write((byte)1);
Write(true);
InternalWriteString(value);
}
}
@ -149,32 +156,27 @@ namespace Server
public void Write(DateTime value)
{
Write(value.Ticks);
}
var ticks = (value.Kind switch
{
DateTimeKind.Local => value.ToUniversalTime(),
DateTimeKind.Unspecified => value.ToLocalTime().ToUniversalTime(),
_ => value
}).Ticks;
public void Write(DateTimeOffset value)
{
Write(value.Ticks);
Write(value.Offset.Ticks);
Write(ticks);
}
public void WriteDeltaTime(DateTime value)
{
var ticks = value.Ticks;
var now = DateTime.UtcNow.Ticks;
TimeSpan d;
try
var ticks = (value.Kind switch
{
d = new TimeSpan(ticks - now);
}
catch
{
d = TimeSpan.MaxValue;
}
DateTimeKind.Local => value.ToUniversalTime(),
DateTimeKind.Unspecified => value.ToLocalTime().ToUniversalTime(),
_ => value
}).Ticks;
Write(d);
// Technically supports negative deltas for times in the past
Write(ticks - DateTime.UtcNow.Ticks);
}
public void Write(IPAddress value)
@ -204,70 +206,64 @@ namespace Server
{
FlushIfNeeded(8);
_buffer[Index] = (byte)value;
_buffer[Index + 1] = (byte)(value >> 8);
_buffer[Index + 2] = (byte)(value >> 16);
_buffer[Index + 3] = (byte)(value >> 24);
_buffer[Index + 4] = (byte)(value >> 32);
_buffer[Index + 5] = (byte)(value >> 40);
_buffer[Index + 6] = (byte)(value >> 48);
_buffer[Index + 7] = (byte)(value >> 56);
Index += 8;
_buffer[Index++] = (byte)value;
_buffer[Index++] = (byte)(value >> 8);
_buffer[Index++] = (byte)(value >> 16);
_buffer[Index++] = (byte)(value >> 24);
_buffer[Index++] = (byte)(value >> 32);
_buffer[Index++] = (byte)(value >> 40);
_buffer[Index++] = (byte)(value >> 48);
_buffer[Index++] = (byte)(value >> 56);
}
public void Write(ulong value)
{
FlushIfNeeded(8);
_buffer[Index] = (byte)value;
_buffer[Index + 1] = (byte)(value >> 8);
_buffer[Index + 2] = (byte)(value >> 16);
_buffer[Index + 3] = (byte)(value >> 24);
_buffer[Index + 4] = (byte)(value >> 32);
_buffer[Index + 5] = (byte)(value >> 40);
_buffer[Index + 6] = (byte)(value >> 48);
_buffer[Index + 7] = (byte)(value >> 56);
Index += 8;
_buffer[Index++] = (byte)value;
_buffer[Index++] = (byte)(value >> 8);
_buffer[Index++] = (byte)(value >> 16);
_buffer[Index++] = (byte)(value >> 24);
_buffer[Index++] = (byte)(value >> 32);
_buffer[Index++] = (byte)(value >> 40);
_buffer[Index++] = (byte)(value >> 48);
_buffer[Index++] = (byte)(value >> 56);
}
public void Write(int value)
{
FlushIfNeeded(4);
_buffer[Index] = (byte)value;
_buffer[Index + 1] = (byte)(value >> 8);
_buffer[Index + 2] = (byte)(value >> 16);
_buffer[Index + 3] = (byte)(value >> 24);
Index += 4;
_buffer[Index++] = (byte)value;
_buffer[Index++] = (byte)(value >> 8);
_buffer[Index++] = (byte)(value >> 16);
_buffer[Index++] = (byte)(value >> 24);
}
public void Write(uint value)
{
FlushIfNeeded(4);
_buffer[Index] = (byte)value;
_buffer[Index + 1] = (byte)(value >> 8);
_buffer[Index + 2] = (byte)(value >> 16);
_buffer[Index + 3] = (byte)(value >> 24);
Index += 4;
_buffer[Index++] = (byte)value;
_buffer[Index++] = (byte)(value >> 8);
_buffer[Index++] = (byte)(value >> 16);
_buffer[Index++] = (byte)(value >> 24);
}
public void Write(short value)
{
FlushIfNeeded(2);
_buffer[Index] = (byte)value;
_buffer[Index + 1] = (byte)(value >> 8);
Index += 2;
_buffer[Index++] = (byte)value;
_buffer[Index++] = (byte)(value >> 8);
}
public void Write(ushort value)
{
FlushIfNeeded(2);
_buffer[Index] = (byte)value;
_buffer[Index + 1] = (byte)(value >> 8);
Index += 2;
_buffer[Index++] = (byte)value;
_buffer[Index++] = (byte)(value >> 8);
}
public unsafe void Write(double value)
@ -301,16 +297,18 @@ namespace Server
_buffer[Index++] = value;
}
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public void Write(sbyte value)
{
FlushIfNeeded(1);
_buffer[Index++] = (byte)value;
}
public void Write(bool value)
[MethodImpl(MethodImplOptions.AggressiveInlining)]
public unsafe void Write(bool value)
{
FlushIfNeeded(1);
_buffer[Index++] = value ? 1 : 0;
_buffer[Index++] = *(byte*)&value; // up to 30% faster to dereference the raw value on the stack
}
public void Write(Point3D value)
@ -348,318 +346,32 @@ namespace Server
Write((byte)(value?.RaceIndex ?? 0xFF));
}
public void WriteEntity(IEntity value)
public void Write(ISerializable value)
{
Write(value?.Deleted != false ? Serial.MinusOne : value.Serial);
}
public void Write(Item value)
public void Write<T>(ICollection<T> coll) where T : class, ISerializable
{
Write(value?.Deleted != false ? Serial.MinusOne : value.Serial);
}
public void Write(Mobile value)
{
Write(value?.Deleted != false ? Serial.MinusOne : value.Serial);
}
public void Write(BaseGuild value)
{
Write(value?.Serial ?? 0);
}
public void WriteItem<T>(T value) where T : Item
{
Write(value);
}
public void WriteMobile<T>(T value) where T : Mobile
{
Write(value);
}
public void WriteGuild<T>(T value) where T : BaseGuild
{
Write(value);
}
public void Write(List<Item> list)
{
WriteItemList(list);
}
public void Write(List<Item> list, bool tidy)
{
WriteItemList(list, tidy);
}
public void WriteItemList<T>(List<T> list) where T : Item
{
WriteItemList(list, false);
}
public void WriteItemList<T>(List<T> list, bool tidy) where T : Item
{
if (tidy)
Write(coll.Count);
foreach (var entry in coll)
{
for (var i = 0; i < list.Count;)
{
if (list[i].Deleted)
{
list.RemoveAt(i);
}
else
{
++i;
}
}
}
Write(list.Count);
for (var i = 0; i < list.Count; ++i)
{
Write(list[i]);
Write(entry);
}
}
public void Write(HashSet<Item> set)
public void Write<T>(ICollection<T> coll, Action<IGenericWriter, T> action) where T : class, ISerializable
{
Write(set, false);
}
public void Write(HashSet<Item> set, bool tidy)
{
if (tidy)
if (coll == null)
{
set.RemoveWhere(item => item.Deleted);
Write(0);
return;
}
Write(set.Count);
foreach (var item in set)
Write(coll.Count);
foreach (var entry in coll)
{
Write(item);
}
}
public void WriteItemSet<T>(HashSet<T> set) where T : Item
{
WriteItemSet(set, false);
}
public void WriteItemSet<T>(HashSet<T> set, bool tidy) where T : Item
{
if (tidy)
{
set.RemoveWhere(item => item.Deleted);
}
Write(set.Count);
foreach (var item in set)
{
Write(item);
}
}
public void Write(List<Mobile> list)
{
Write(list, false);
}
public void Write(List<Mobile> list, bool tidy)
{
if (tidy)
{
for (var i = 0; i < list.Count;)
{
if (list[i].Deleted)
{
list.RemoveAt(i);
}
else
{
++i;
}
}
}
Write(list.Count);
for (var i = 0; i < list.Count; ++i)
{
Write(list[i]);
}
}
public void WriteMobileList<T>(List<T> list) where T : Mobile
{
WriteMobileList(list, false);
}
public void WriteMobileList<T>(List<T> list, bool tidy) where T : Mobile
{
if (tidy)
{
for (var i = 0; i < list.Count;)
{
if (list[i].Deleted)
{
list.RemoveAt(i);
}
else
{
++i;
}
}
}
Write(list.Count);
for (var i = 0; i < list.Count; ++i)
{
Write(list[i]);
}
}
public void Write(HashSet<Mobile> set)
{
Write(set, false);
}
public void Write(HashSet<Mobile> set, bool tidy)
{
if (tidy)
{
set.RemoveWhere(mobile => mobile.Deleted);
}
Write(set.Count);
foreach (var mob in set)
{
Write(mob);
}
}
public void WriteMobileSet<T>(HashSet<T> set) where T : Mobile
{
WriteMobileSet(set, false);
}
public void WriteMobileSet<T>(HashSet<T> set, bool tidy) where T : Mobile
{
if (tidy)
{
set.RemoveWhere(mob => mob.Deleted);
}
Write(set.Count);
foreach (var mob in set)
{
Write(mob);
}
}
public void Write(List<BaseGuild> list)
{
Write(list, false);
}
public void Write(List<BaseGuild> list, bool tidy)
{
if (tidy)
{
for (var i = 0; i < list.Count;)
{
if (list[i].Disbanded)
{
list.RemoveAt(i);
}
else
{
++i;
}
}
}
Write(list.Count);
for (var i = 0; i < list.Count; ++i)
{
Write(list[i]);
}
}
public void WriteGuildList<T>(List<T> list) where T : BaseGuild
{
WriteGuildList(list, false);
}
public void WriteGuildList<T>(List<T> list, bool tidy) where T : BaseGuild
{
if (tidy)
{
for (var i = 0; i < list.Count;)
{
if (list[i].Disbanded)
{
list.RemoveAt(i);
}
else
{
++i;
}
}
}
Write(list.Count);
for (var i = 0; i < list.Count; ++i)
{
Write(list[i]);
}
}
public void Write(HashSet<BaseGuild> set)
{
Write(set, false);
}
public void Write(HashSet<BaseGuild> set, bool tidy)
{
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set)
{
Write(guild);
}
}
public void WriteGuildSet<T>(HashSet<T> set) where T : BaseGuild
{
WriteGuildSet(set, false);
}
public void WriteGuildSet<T>(HashSet<T> set, bool tidy) where T : BaseGuild
{
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set)
{
Write(guild);
action(this, entry);
}
}
@ -668,6 +380,7 @@ namespace Server
var remaining = m_Encoding.GetByteCount(value);
WriteEncodedInt(remaining);
if (remaining == 0)
{
return;

24
Projects/Server/Serialization/IGenericReader.cs
View file

@ -16,7 +16,6 @@
using System;
using System.Collections.Generic;
using System.Net;
using Server.Guilds;
namespace Server
{
@ -24,7 +23,6 @@ namespace Server
{
string ReadString();
DateTime ReadDateTime();
DateTimeOffset ReadDateTimeOffset();
TimeSpan ReadTimeSpan();
DateTime ReadDeltaTime();
decimal ReadDecimal();
@ -46,25 +44,9 @@ namespace Server
Rectangle2D ReadRect2D();
Rectangle3D ReadRect3D();
Map ReadMap();
IEntity ReadEntity();
Item ReadItem();
Mobile ReadMobile();
BaseGuild ReadGuild();
T ReadItem<T>() where T : Item;
T ReadMobile<T>() where T : Mobile;
T ReadGuild<T>() where T : BaseGuild;
List<Item> ReadStrongItemList();
List<T> ReadStrongItemList<T>() where T : Item;
List<Mobile> ReadStrongMobileList();
List<T> ReadStrongMobileList<T>() where T : Mobile;
List<BaseGuild> ReadStrongGuildList();
List<T> ReadStrongGuildList<T>() where T : BaseGuild;
HashSet<Item> ReadItemSet();
HashSet<T> ReadItemSet<T>() where T : Item;
HashSet<Mobile> ReadMobileSet();
HashSet<T> ReadMobileSet<T>() where T : Mobile;
HashSet<BaseGuild> ReadGuildSet();
HashSet<T> ReadGuildSet<T>() where T : BaseGuild;
T ReadEntity<T>() where T : class, ISerializable;
List<T> ReadEntityList<T>() where T : class, ISerializable;
HashSet<T> ReadEntitySet<T>() where T : class, ISerializable;
Race ReadRace();
int Read(Span<byte> buffer);
}

35
Projects/Server/Serialization/IGenericWriter.cs
View file

@ -17,7 +17,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using Server.Guilds;
namespace Server
{
@ -27,7 +26,6 @@ namespace Server
void Close();
void Write(string value);
void Write(DateTime value);
void Write(DateTimeOffset value);
void Write(TimeSpan value);
void Write(decimal value);
void Write(long value);
@ -49,38 +47,9 @@ namespace Server
void Write(Rectangle2D value);
void Write(Rectangle3D value);
void Write(Map value);
void WriteEntity(IEntity value);
void Write(Item value);
void Write(Mobile value);
void Write(BaseGuild value);
void WriteItem<T>(T value) where T : Item;
void WriteMobile<T>(T value) where T : Mobile;
void WriteGuild<T>(T value) where T : BaseGuild;
void Write(ISerializable value);
void Write(Race value);
void Write(List<Item> list);
void Write(List<Item> list, bool tidy);
void WriteItemList<T>(List<T> list) where T : Item;
void WriteItemList<T>(List<T> list, bool tidy) where T : Item;
void Write(HashSet<Item> list);
void Write(HashSet<Item> list, bool tidy);
void WriteItemSet<T>(HashSet<T> set) where T : Item;
void WriteItemSet<T>(HashSet<T> set, bool tidy) where T : Item;
void Write(List<Mobile> list);
void Write(List<Mobile> list, bool tidy);
void WriteMobileList<T>(List<T> list) where T : Mobile;
void WriteMobileList<T>(List<T> list, bool tidy) where T : Mobile;
void Write(HashSet<Mobile> list);
void Write(HashSet<Mobile> list, bool tidy);
void WriteMobileSet<T>(HashSet<T> set) where T : Mobile;
void WriteMobileSet<T>(HashSet<T> set, bool tidy) where T : Mobile;
void Write(List<BaseGuild> list);
void Write(List<BaseGuild> list, bool tidy);
void WriteGuildList<T>(List<T> list) where T : BaseGuild;
void WriteGuildList<T>(List<T> list, bool tidy) where T : BaseGuild;
void Write(HashSet<BaseGuild> list);
void Write(HashSet<BaseGuild> list, bool tidy);
void WriteGuildSet<T>(HashSet<T> set) where T : BaseGuild;
void WriteGuildSet<T>(HashSet<T> set, bool tidy) where T : BaseGuild;
void Write<T>(ICollection<T> list) where T : class, ISerializable;
void Write(ReadOnlySpan<byte> bytes);
long Seek(long offset, SeekOrigin origin);

18
Projects/Server/Serialization/ISerializable.cs
View file

@ -13,16 +13,30 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. *
*************************************************************************/
using System.IO;
namespace Server
{
public interface ISerializable
{
BufferWriter SaveBuffer { get; set; }
BufferWriter SaveBuffer { get; protected internal set; }
int TypeRef { get; }
Serial Serial { get; }
void Serialize();
void Deserialize(IGenericReader reader);
void Serialize(IGenericWriter writer);
void Delete();
bool Deleted { get; }
public void InitializeSaveBuffer(byte[] buffer)
{
SaveBuffer = new BufferWriter(buffer, true);
}
public void Serialize()
{
SaveBuffer ??= new BufferWriter(true);
SaveBuffer.Seek(0, SeekOrigin.Begin);
Serialize(SaveBuffer);
}
}
}

19
Projects/Server/Utilities/Utility.cs
View file

@ -1437,5 +1437,24 @@ namespace Server
return string.Join(lineSeparator, parts);
}
public static void Tidy<T>(this List<T> list) where T : ISerializable
{
for (int i = list.Count - 1; i >= 0; i--)
{
var entry = list[i];
if (entry?.Deleted != false)
{
list.RemoveAt(i);
}
}
list.TrimExcess();
}
public static void Tidy<T>(this HashSet<T> set) where T : ISerializable
{
set.RemoveWhere(entry => entry?.Deleted != false);
}
}
}

14
Projects/Server/World/World.cs
View file

@ -126,7 +126,7 @@ namespace Server
public static WorldState WorldState { get; private set; }
public static bool Saving => WorldState == WorldState.Saving;
public static bool Running => WorldState == WorldState.Running;
public static bool Running => WorldState != WorldState.Loading && WorldState != WorldState.Initial;
public static bool Loading => WorldState == WorldState.Loading;
public static Dictionary<Serial, Mobile> Mobiles { get; private set; }
@ -290,7 +290,7 @@ namespace Server
return map;
}
private static void SaveBuffers<I, T>(IIndexInfo<I> indexInfo, List<EntityIndex<T>> entities) where T : ISerializable
private static void SaveBuffers<I, T>(IIndexInfo<I> indexInfo, List<EntityIndex<T>> entities) where T : class, ISerializable
{
var indexType = indexInfo.TypeName;
@ -306,20 +306,20 @@ namespace Server
foreach (var entry in entities)
{
T t = entry.Entity;
T e = entry.Entity;
if (t == null || t is IEntity entity && entity.Deleted)
if (e == null || e is IEntity entity && entity.Deleted)
{
continue;
}
byte[] saveBuffer = GC.AllocateUninitializedArray<byte>(entry.Length);
reader.Read(saveBuffer, 0, entry.Length);
t.SaveBuffer = new BufferWriter(saveBuffer, true);
e.InitializeSaveBuffer(saveBuffer);
}
}
private static void LoadData<I, T>(IIndexInfo<I> indexInfo, List<EntityIndex<T>> entities) where T : ISerializable
private static void LoadData<I, T>(IIndexInfo<I> indexInfo, List<EntityIndex<T>> entities) where T : class, ISerializable
{
var indexType = indexInfo.TypeName;
@ -772,7 +772,7 @@ namespace Server
public static void RemoveGuild(BaseGuild guild) => Guilds.Remove(guild.Serial);
public static void SerializeTo(this ISerializable entity, IGenericWriter writer)
private static void SerializeTo(this ISerializable entity, IGenericWriter writer)
{
var saveBuffer = entity.SaveBuffer;
writer.Write(saveBuffer.Buffer.AsSpan(0, (int)saveBuffer.Position));

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

4
Projects/UOContent/Holiday Stuff/Halloween/2012/Engines/PlayerZombies.cs
View file

@ -262,7 +262,7 @@ namespace Server.Engines.Events
base.Serialize(writer);
writer.Write(0);
writer.WriteMobile(m_DeadPlayer);
writer.Write(m_DeadPlayer);
}
public override void Deserialize(IGenericReader reader)
@ -270,7 +270,7 @@ namespace Server.Engines.Events
base.Deserialize(reader);
var version = reader.ReadInt();
m_DeadPlayer = reader.ReadMobile<PlayerMobile>();
m_DeadPlayer = reader.ReadEntity<PlayerMobile>();
}
}
}

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

Some files were not shown because too many files have changed in this diff Show more