diff --git a/Projects/Server.Tests/Server.Tests.csproj b/Projects/Server.Tests/Server.Tests.csproj index cce96fef5..00fa89268 100644 --- a/Projects/Server.Tests/Server.Tests.csproj +++ b/Projects/Server.Tests/Server.Tests.csproj @@ -5,8 +5,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Projects/Server/Guild.cs b/Projects/Server/Guild.cs index 46aac0f74..29370d183 100644 --- a/Projects/Server/Guild.cs +++ b/Projects/Server/Guild.cs @@ -54,11 +54,10 @@ public abstract class BaseGuild : ISerializable public BufferWriter SaveBuffer { get; set; } - public int TypeRef { get; private set; } - public abstract void Serialize(IGenericWriter writer); public abstract void Deserialize(IGenericReader reader); + public abstract void OnDelete(Mobile mob); public static BaseGuild FindByName(string name) diff --git a/Projects/Server/IEntity.cs b/Projects/Server/IEntity.cs index 511748427..bcb5613f2 100644 --- a/Projects/Server/IEntity.cs +++ b/Projects/Server/IEntity.cs @@ -55,8 +55,6 @@ public class Entity : IEntity public BufferWriter SaveBuffer { get; set; } - public int TypeRef => -1; - public Serial Serial { get; } public Point3D Location { get; private set; } diff --git a/Projects/Server/Server.csproj b/Projects/Server/Server.csproj index 73d4808a8..927dafc05 100755 --- a/Projects/Server/Server.csproj +++ b/Projects/Server/Server.csproj @@ -35,7 +35,7 @@ - + diff --git a/Projects/UOContent.Tests/UOContent.Tests.csproj b/Projects/UOContent.Tests/UOContent.Tests.csproj index 87cfafb0d..43dc83913 100644 --- a/Projects/UOContent.Tests/UOContent.Tests.csproj +++ b/Projects/UOContent.Tests/UOContent.Tests.csproj @@ -5,8 +5,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/Projects/UOContent/Accounting/Accounts.cs b/Projects/UOContent/Accounting/Accounts.cs index 5e0d58792..5cb730cdd 100644 --- a/Projects/UOContent/Accounting/Accounts.cs +++ b/Projects/UOContent/Accounting/Accounts.cs @@ -29,11 +29,7 @@ public class Accounts : GenericEntityPersistence public static IEnumerable GetAccounts() => _accountsByName.Values; - public static IAccount GetAccount(string username) - { - _accountsByName.TryGetValue(username, out var a); - return a; - } + public static IAccount GetAccount(string username) => _accountsByName.GetValueOrDefault(username); public static void Add(Account a) { diff --git a/Projects/UOContent/UOContent.csproj b/Projects/UOContent/UOContent.csproj index e53ef779c..bcc97b991 100644 --- a/Projects/UOContent/UOContent.csproj +++ b/Projects/UOContent/UOContent.csproj @@ -34,7 +34,7 @@ false - +