warrentyexpired/ModernUO
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup/Housekeeping (#242)

Browse source
This commit is contained in:
Kamron Batman 2020-09-12 15:31:21 -07:00 • committed by GitHub
parent 90ede0659f
commit 741e8d8300
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
228 changed files with 6292 additions and 2690 deletions
Download patch file Download diff file Expand all files Collapse all files

146
Projects/Server/Serialization/AsyncWriter.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: AsyncWriter.cs *
* *
@ -62,7 +62,9 @@ namespace Server
set
{
if (m_Mem.Length > 0)
{
Enqueue(m_Mem);
}
m_Mem = value;
m_Bin = new BinaryWriter(m_Mem, Utility.UTF8WithEncoding);
@ -277,49 +279,73 @@ namespace Server
public void Write(Map value)
{
if (value != null)
{
Write((byte)value.MapIndex);
}
else
{
Write((byte)0xFF);
}
}
public void Write(Race value)
{
if (value != null)
{
Write((byte)value.RaceIndex);
}
else
{
Write((byte)0xFF);
}
}
public void WriteEntity(IEntity value)
{
if (value?.Deleted != false)
{
Write(Serial.MinusOne);
}
else
{
Write(value.Serial);
}
}
public void Write(Item value)
{
if (value?.Deleted != false)
{
Write(Serial.MinusOne);
}
else
{
Write(value.Serial);
}
}
public void Write(Mobile value)
{
if (value?.Deleted != false)
{
Write(Serial.MinusOne);
}
else
{
Write(value.Serial);
}
}
public void Write(BaseGuild value)
{
if (value == null)
{
Write(0);
}
else
{
Write(value.Serial);
}
}
public void WriteItem<T>(T value) where T : Item
@ -355,16 +381,26 @@ namespace Server
public void WriteItemList<T>(List<T> list, bool tidy) where T : Item
{
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<Item> set)
@ -374,11 +410,17 @@ namespace Server
public void Write(HashSet<Item> set, bool tidy)
{
if (tidy) set.RemoveWhere(item => item.Deleted);
if (tidy)
{
set.RemoveWhere(item => item.Deleted);
}
Write(set.Count);
foreach (var item in set) Write(item);
foreach (var item in set)
{
Write(item);
}
}
public void WriteItemSet<T>(HashSet<T> set) where T : Item
@ -388,11 +430,17 @@ namespace Server
public void WriteItemSet<T>(HashSet<T> set, bool tidy) where T : Item
{
if (tidy) set.RemoveWhere(item => item.Deleted);
if (tidy)
{
set.RemoveWhere(item => item.Deleted);
}
Write(set.Count);
foreach (var item in set) Write(item);
foreach (var item in set)
{
Write(item);
}
}
public void Write(List<Mobile> list)
@ -403,16 +451,26 @@ namespace Server
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
@ -423,16 +481,26 @@ namespace Server
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)
@ -442,11 +510,17 @@ namespace Server
public void Write(HashSet<Mobile> set, bool tidy)
{
if (tidy) set.RemoveWhere(mobile => mobile.Deleted);
if (tidy)
{
set.RemoveWhere(mobile => mobile.Deleted);
}
Write(set.Count);
foreach (var mob in set) Write(mob);
foreach (var mob in set)
{
Write(mob);
}
}
public void WriteMobileSet<T>(HashSet<T> set) where T : Mobile
@ -456,11 +530,17 @@ namespace Server
public void WriteMobileSet<T>(HashSet<T> set, bool tidy) where T : Mobile
{
if (tidy) set.RemoveWhere(mob => mob.Deleted);
if (tidy)
{
set.RemoveWhere(mob => mob.Deleted);
}
Write(set.Count);
foreach (var mob in set) Write(mob);
foreach (var mob in set)
{
Write(mob);
}
}
public void Write(List<BaseGuild> list)
@ -471,16 +551,26 @@ namespace Server
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
@ -491,16 +581,26 @@ namespace Server
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)
@ -510,11 +610,17 @@ namespace Server
public void Write(HashSet<BaseGuild> set, bool tidy)
{
if (tidy) set.RemoveWhere(guild => guild.Disbanded);
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set) Write(guild);
foreach (var guild in set)
{
Write(guild);
}
}
public void WriteGuildSet<T>(HashSet<T> set) where T : BaseGuild
@ -524,11 +630,17 @@ namespace Server
public void WriteGuildSet<T>(HashSet<T> set, bool tidy) where T : BaseGuild
{
if (tidy) set.RemoveWhere(guild => guild.Disbanded);
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set) Write(guild);
foreach (var guild in set)
{
Write(guild);
}
}
private void Enqueue(MemoryStream mem)
@ -578,20 +690,28 @@ namespace Server
lock (m_Owner.m_WriteQueue)
{
if ((lastCount = m_Owner.m_WriteQueue.Count) > 0)
{
mem = m_Owner.m_WriteQueue.Dequeue();
}
}
if (mem?.Length > 0)
{
mem.WriteTo(m_Owner.m_File);
}
} while (lastCount > 1);
if (m_Owner.m_Closed)
{
m_Owner.m_File.Close();
}
ThreadCount--;
if (ThreadCount <= 0)
{
World.NotifyDiskWriteComplete();
}
}
}
}

31
Projects/Server/Serialization/BinaryFileReader.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: BinaryFileReader.cs *
* *
@ -37,9 +37,14 @@ namespace Server
var now = DateTime.UtcNow.Ticks;
if (ticks > 0 && ticks + now < 0)
{
return DateTime.MaxValue;
}
if (ticks < 0 && ticks + now < 0)
{
return DateTime.MinValue;
}
try
{
@ -145,8 +150,12 @@ namespace Server
var list = new List<T>(count);
for (var i = 0; i < count; ++i)
{
if (ReadItem() is T item)
{
list.Add(item);
}
}
return list;
}
@ -165,8 +174,12 @@ namespace Server
var set = new HashSet<T>();
for (var i = 0; i < count; ++i)
{
if (ReadItem() is T item)
{
set.Add(item);
}
}
return set;
}
@ -185,8 +198,12 @@ namespace Server
var list = new List<T>(count);
for (var i = 0; i < count; ++i)
{
if (ReadMobile() is T m)
{
list.Add(m);
}
}
return list;
}
@ -205,8 +222,12 @@ namespace Server
var set = new HashSet<T>();
for (var i = 0; i < count; ++i)
{
if (ReadMobile() is T item)
{
set.Add(item);
}
}
return set;
}
@ -225,8 +246,12 @@ namespace Server
var list = new List<T>(count);
for (var i = 0; i < count; ++i)
{
if (ReadGuild() is T g)
{
list.Add(g);
}
}
return list;
}
@ -245,8 +270,12 @@ namespace Server
var set = new HashSet<T>();
for (var i = 0; i < count; ++i)
{
if (ReadGuild() is T item)
{
set.Add(item);
}
}
return set;
}

180
Projects/Server/Serialization/BinaryFileWriter.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: BinaryFileWriter.cs *
* *
@ -64,7 +64,9 @@ namespace Server
get
{
if (m_Index > 0)
{
Flush();
}
return m_File;
}
@ -75,7 +77,9 @@ namespace Server
public void Close()
{
if (m_Index > 0)
{
Flush();
}
m_File.Close();
}
@ -87,14 +91,18 @@ namespace Server
while (v >= 0x80)
{
if (m_Index + 1 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index++] = (byte)(v | 0x80);
v >>= 7;
}
if (m_Index + 1 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index++] = (byte)v;
}
@ -106,14 +114,18 @@ namespace Server
if (value == null)
{
if (m_Index + 1 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index++] = 0;
}
else
{
if (m_Index + 1 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index++] = 1;
@ -171,13 +183,17 @@ namespace Server
var bits = decimal.GetBits(value);
for (var i = 0; i < bits.Length; ++i)
{
Write(bits[i]);
}
}
public void Write(long value)
{
if (m_Index + 8 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index] = (byte)value;
m_Buffer[m_Index + 1] = (byte)(value >> 8);
@ -193,7 +209,9 @@ namespace Server
public void Write(ulong value)
{
if (m_Index + 8 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index] = (byte)value;
m_Buffer[m_Index + 1] = (byte)(value >> 8);
@ -209,7 +227,9 @@ namespace Server
public void Write(int value)
{
if (m_Index + 4 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index] = (byte)value;
m_Buffer[m_Index + 1] = (byte)(value >> 8);
@ -221,7 +241,9 @@ namespace Server
public void Write(uint value)
{
if (m_Index + 4 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index] = (byte)value;
m_Buffer[m_Index + 1] = (byte)(value >> 8);
@ -233,7 +255,9 @@ namespace Server
public void Write(short value)
{
if (m_Index + 2 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index] = (byte)value;
m_Buffer[m_Index + 1] = (byte)(value >> 8);
@ -243,7 +267,9 @@ namespace Server
public void Write(ushort value)
{
if (m_Index + 2 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index] = (byte)value;
m_Buffer[m_Index + 1] = (byte)(value >> 8);
@ -253,7 +279,9 @@ namespace Server
public unsafe void Write(double value)
{
if (m_Index + 8 > m_Buffer.Length)
{
Flush();
}
fixed (byte* pBuffer = m_Buffer)
{
@ -266,7 +294,9 @@ namespace Server
public unsafe void Write(float value)
{
if (m_Index + 4 > m_Buffer.Length)
{
Flush();
}
fixed (byte* pBuffer = m_Buffer)
{
@ -279,7 +309,9 @@ namespace Server
public void Write(char value)
{
if (m_Index + 8 > m_Buffer.Length)
{
Flush();
}
m_SingleCharBuffer[0] = value;
@ -290,7 +322,9 @@ namespace Server
public void Write(byte value)
{
if (m_Index + 1 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index++] = value;
}
@ -303,7 +337,9 @@ namespace Server
public void Write(byte[] value, int length)
{
if (m_Index + length > m_Buffer.Length)
{
Flush();
}
Buffer.BlockCopy(value, 0, m_Buffer, m_Index, length);
m_Index += length;
@ -312,7 +348,9 @@ namespace Server
public void Write(sbyte value)
{
if (m_Index + 1 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index++] = (byte)value;
}
@ -320,7 +358,9 @@ namespace Server
public void Write(bool value)
{
if (m_Index + 1 > m_Buffer.Length)
{
Flush();
}
m_Buffer[m_Index++] = (byte)(value ? 1 : 0);
}
@ -353,49 +393,73 @@ namespace Server
public void Write(Map value)
{
if (value != null)
{
Write((byte)value.MapIndex);
}
else
{
Write((byte)0xFF);
}
}
public void Write(Race value)
{
if (value != null)
{
Write((byte)value.RaceIndex);
}
else
{
Write((byte)0xFF);
}
}
public void WriteEntity(IEntity value)
{
if (value?.Deleted != false)
{
Write(Serial.MinusOne);
}
else
{
Write(value.Serial);
}
}
public void Write(Item value)
{
if (value?.Deleted != false)
{
Write(Serial.MinusOne);
}
else
{
Write(value.Serial);
}
}
public void Write(Mobile value)
{
if (value?.Deleted != false)
{
Write(Serial.MinusOne);
}
else
{
Write(value.Serial);
}
}
public void Write(BaseGuild value)
{
if (value == null)
{
Write(0);
}
else
{
Write(value.Serial);
}
}
public void WriteItem<T>(T value) where T : Item
@ -431,16 +495,26 @@ namespace Server
public void WriteItemList<T>(List<T> list, bool tidy) where T : Item
{
if (tidy)
{
for (var i = 0; i < list.Count;)
{
if (list[i]?.Deleted != false)
{
list.RemoveAt(i);
}
else
{
++i;
}
}
}
Write(list.Count);
for (var i = 0; i < list.Count; ++i)
{
Write(list[i]);
}
}
public void Write(HashSet<Item> set)
@ -450,11 +524,17 @@ namespace Server
public void Write(HashSet<Item> set, bool tidy)
{
if (tidy) set.RemoveWhere(item => item.Deleted);
if (tidy)
{
set.RemoveWhere(item => item.Deleted);
}
Write(set.Count);
foreach (var item in set) Write(item);
foreach (var item in set)
{
Write(item);
}
}
public void WriteItemSet<T>(HashSet<T> set) where T : Item
@ -464,11 +544,17 @@ namespace Server
public void WriteItemSet<T>(HashSet<T> set, bool tidy) where T : Item
{
if (tidy) set.RemoveWhere(item => item.Deleted);
if (tidy)
{
set.RemoveWhere(item => item.Deleted);
}
Write(set.Count);
foreach (var item in set) Write(item);
foreach (var item in set)
{
Write(item);
}
}
public void Write(List<Mobile> list)
@ -479,16 +565,26 @@ namespace Server
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
@ -499,16 +595,26 @@ namespace Server
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)
@ -518,11 +624,17 @@ namespace Server
public void Write(HashSet<Mobile> set, bool tidy)
{
if (tidy) set.RemoveWhere(mobile => mobile.Deleted);
if (tidy)
{
set.RemoveWhere(mobile => mobile.Deleted);
}
Write(set.Count);
foreach (var mob in set) Write(mob);
foreach (var mob in set)
{
Write(mob);
}
}
public void WriteMobileSet<T>(HashSet<T> set) where T : Mobile
@ -532,11 +644,17 @@ namespace Server
public void WriteMobileSet<T>(HashSet<T> set, bool tidy) where T : Mobile
{
if (tidy) set.RemoveWhere(mob => mob.Deleted);
if (tidy)
{
set.RemoveWhere(mob => mob.Deleted);
}
Write(set.Count);
foreach (var mob in set) Write(mob);
foreach (var mob in set)
{
Write(mob);
}
}
public void Write(List<BaseGuild> list)
@ -547,16 +665,26 @@ namespace Server
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
@ -567,16 +695,26 @@ namespace Server
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)
@ -586,11 +724,17 @@ namespace Server
public void Write(HashSet<BaseGuild> set, bool tidy)
{
if (tidy) set.RemoveWhere(guild => guild.Disbanded);
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set) Write(guild);
foreach (var guild in set)
{
Write(guild);
}
}
public void WriteGuildSet<T>(HashSet<T> set) where T : BaseGuild
@ -600,11 +744,17 @@ namespace Server
public void WriteGuildSet<T>(HashSet<T> set, bool tidy) where T : BaseGuild
{
if (tidy) set.RemoveWhere(guild => guild.Disbanded);
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set) Write(guild);
foreach (var guild in set)
{
Write(guild);
}
}
public void Flush()
@ -641,7 +791,9 @@ namespace Server
var byteLength = m_Encoding.GetBytes(value, current, charCount, m_CharacterBuffer, 0);
if (m_Index + byteLength > m_Buffer.Length)
{
Flush();
}
Buffer.BlockCopy(m_CharacterBuffer, 0, m_Buffer, m_Index, byteLength);
m_Index += byteLength;
@ -655,7 +807,9 @@ namespace Server
var byteLength = m_Encoding.GetBytes(value, 0, value.Length, m_CharacterBuffer, 0);
if (m_Index + byteLength > m_Buffer.Length)
{
Flush();
}
Buffer.BlockCopy(m_CharacterBuffer, 0, m_Buffer, m_Index, byteLength);
m_Index += byteLength;

164
Projects/Server/Serialization/BufferedFileWriter.cs
View file

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: BufferedFileWriter.cs *
* *
@ -59,14 +59,18 @@ namespace Server
while (v >= 0x80)
{
if (m_Index + 1 > Data.Length)
{
Expand();
}
Data[m_Index++] = (byte)(v | 0x80);
v >>= 7;
}
if (m_Index + 1 > Data.Length)
{
Expand();
}
Data[m_Index++] = (byte)v;
}
@ -78,14 +82,18 @@ namespace Server
if (value == null)
{
if (m_Index + 1 > Data.Length)
{
Expand();
}
Data[m_Index++] = 0;
}
else
{
if (m_Index + 1 > Data.Length)
{
Expand();
}
Data[m_Index++] = 1;
@ -143,13 +151,17 @@ namespace Server
var bits = decimal.GetBits(value);
for (var i = 0; i < bits.Length; ++i)
{
Write(bits[i]);
}
}
public void Write(long value)
{
if (m_Index + 8 > Data.Length)
{
Expand();
}
Data[m_Index] = (byte)value;
Data[m_Index + 1] = (byte)(value >> 8);
@ -165,7 +177,9 @@ namespace Server
public void Write(ulong value)
{
if (m_Index + 8 > Data.Length)
{
Expand();
}
Data[m_Index] = (byte)value;
Data[m_Index + 1] = (byte)(value >> 8);
@ -181,7 +195,9 @@ namespace Server
public void Write(int value)
{
if (m_Index + 4 > Data.Length)
{
Expand();
}
Data[m_Index] = (byte)value;
Data[m_Index + 1] = (byte)(value >> 8);
@ -193,7 +209,9 @@ namespace Server
public void Write(uint value)
{
if (m_Index + 4 > Data.Length)
{
Expand();
}
Data[m_Index] = (byte)value;
Data[m_Index + 1] = (byte)(value >> 8);
@ -205,7 +223,9 @@ namespace Server
public void Write(short value)
{
if (m_Index + 2 > Data.Length)
{
Expand();
}
Data[m_Index] = (byte)value;
Data[m_Index + 1] = (byte)(value >> 8);
@ -215,7 +235,9 @@ namespace Server
public void Write(ushort value)
{
if (m_Index + 2 > Data.Length)
{
Expand();
}
Data[m_Index] = (byte)value;
Data[m_Index + 1] = (byte)(value >> 8);
@ -225,7 +247,9 @@ namespace Server
public unsafe void Write(double value)
{
if (m_Index + 8 > Data.Length)
{
Expand();
}
fixed (byte* pBuffer = Data)
{
@ -238,7 +262,9 @@ namespace Server
public unsafe void Write(float value)
{
if (m_Index + 4 > Data.Length)
{
Expand();
}
fixed (byte* pBuffer = Data)
{
@ -251,7 +277,9 @@ namespace Server
public void Write(char value)
{
if (m_Index + 8 > Data.Length)
{
Expand();
}
m_SingleCharBuffer[0] = value;
@ -262,7 +290,9 @@ namespace Server
public void Write(byte value)
{
if (m_Index + 1 > Data.Length)
{
Expand();
}
Data[m_Index++] = value;
}
@ -275,7 +305,9 @@ namespace Server
public void Write(byte[] value, int length)
{
while (m_Index + length > Data.Length)
{
Expand();
}
Buffer.BlockCopy(value, 0, Data, m_Index, length);
m_Index += length;
@ -284,7 +316,9 @@ namespace Server
public void Write(sbyte value)
{
if (m_Index + 1 > Data.Length)
{
Expand();
}
Data[m_Index++] = (byte)value;
}
@ -292,7 +326,9 @@ namespace Server
public void Write(bool value)
{
if (m_Index + 1 > Data.Length)
{
Expand();
}
Data[m_Index++] = (byte)(value ? 1 : 0);
}
@ -325,17 +361,25 @@ namespace Server
public void Write(Map value)
{
if (value != null)
{
Write((byte)value.MapIndex);
}
else
{
Write((byte)0xFF);
}
}
public void Write(Race value)
{
if (value != null)
{
Write((byte)value.RaceIndex);
}
else
{
Write((byte)0xFF);
}
}
public void WriteEntity(IEntity value)
@ -356,9 +400,13 @@ namespace Server
public void Write(BaseGuild value)
{
if (value == null)
{
Write(0);
}
else
{
Write(value.Serial);
}
}
public void WriteItem<T>(T value) where T : Item
@ -394,16 +442,26 @@ namespace Server
public void WriteItemList<T>(List<T> list, bool tidy) where T : Item
{
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<Item> set)
@ -413,11 +471,17 @@ namespace Server
public void Write(HashSet<Item> set, bool tidy)
{
if (tidy) set.RemoveWhere(item => item.Deleted);
if (tidy)
{
set.RemoveWhere(item => item.Deleted);
}
Write(set.Count);
foreach (var item in set) Write(item);
foreach (var item in set)
{
Write(item);
}
}
public void WriteItemSet<T>(HashSet<T> set) where T : Item
@ -427,11 +491,17 @@ namespace Server
public void WriteItemSet<T>(HashSet<T> set, bool tidy) where T : Item
{
if (tidy) set.RemoveWhere(item => item.Deleted);
if (tidy)
{
set.RemoveWhere(item => item.Deleted);
}
Write(set.Count);
foreach (var item in set) Write(item);
foreach (var item in set)
{
Write(item);
}
}
public void Write(List<Mobile> list)
@ -442,16 +512,26 @@ namespace Server
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
@ -462,16 +542,26 @@ namespace Server
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)
@ -481,11 +571,17 @@ namespace Server
public void Write(HashSet<Mobile> set, bool tidy)
{
if (tidy) set.RemoveWhere(mobile => mobile.Deleted);
if (tidy)
{
set.RemoveWhere(mobile => mobile.Deleted);
}
Write(set.Count);
foreach (var mob in set) Write(mob);
foreach (var mob in set)
{
Write(mob);
}
}
public void WriteMobileSet<T>(HashSet<T> set) where T : Mobile
@ -495,11 +591,17 @@ namespace Server
public void WriteMobileSet<T>(HashSet<T> set, bool tidy) where T : Mobile
{
if (tidy) set.RemoveWhere(mob => mob.Deleted);
if (tidy)
{
set.RemoveWhere(mob => mob.Deleted);
}
Write(set.Count);
foreach (var mob in set) Write(mob);
foreach (var mob in set)
{
Write(mob);
}
}
public void Write(List<BaseGuild> list)
@ -510,16 +612,26 @@ namespace Server
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
@ -530,16 +642,26 @@ namespace Server
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)
@ -549,11 +671,17 @@ namespace Server
public void Write(HashSet<BaseGuild> set, bool tidy)
{
if (tidy) set.RemoveWhere(guild => guild.Disbanded);
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set) Write(guild);
foreach (var guild in set)
{
Write(guild);
}
}
public void WriteGuildSet<T>(HashSet<T> set) where T : BaseGuild
@ -563,11 +691,17 @@ namespace Server
public void WriteGuildSet<T>(HashSet<T> set, bool tidy) where T : BaseGuild
{
if (tidy) set.RemoveWhere(guild => guild.Disbanded);
if (tidy)
{
set.RemoveWhere(guild => guild.Disbanded);
}
Write(set.Count);
foreach (var guild in set) Write(guild);
foreach (var guild in set)
{
Write(guild);
}
}
public void Flush()
@ -605,7 +739,9 @@ namespace Server
var byteLength = m_Encoding.GetBytes(value, current, charCount, m_CharacterBuffer, 0);
if (m_Index + byteLength > Data.Length)
{
Expand();
}
Buffer.BlockCopy(m_CharacterBuffer, 0, Data, m_Index, byteLength);
m_Index += byteLength;
@ -619,7 +755,9 @@ namespace Server
var byteLength = m_Encoding.GetBytes(value, 0, value.Length, m_CharacterBuffer, 0);
if (m_Index + byteLength > Data.Length)
{
Expand();
}
Buffer.BlockCopy(m_CharacterBuffer, 0, Data, m_Index, byteLength);
m_Index += byteLength;

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

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: IGenericReader.cs *
* *

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

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: IGenericWriter.cs *
* *

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

@ -1,6 +1,6 @@
/*************************************************************************
* ModernUO *
* Copyright (C) 2019-2020 - ModernUO Development Team *
* Copyright 2019-2020 - ModernUO Development Team *
* Email: hi@modernuo.com *
* File: ISerializable.cs *
* *