From 079eeb1b9694031c94ea8409f418755f1fc88db3 Mon Sep 17 00:00:00 2001 From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com> Date: Fri, 5 Feb 2021 14:09:57 -0800 Subject: [PATCH] fix(core): Fixes nullables being disabled (#466) --- Projects/Server/Buffers/ValueStringBuilder.cs | 2 +- Projects/Server/Collections/OrderedHashSet.cs | 2 +- Projects/Server/Items/Item.cs | 2 +- Projects/Server/Main.cs | 4 ++-- Projects/Server/Mobiles/Mobile.cs | 2 +- Projects/UOContent/Commands/Object Creation/CAGObject.cs | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Projects/Server/Buffers/ValueStringBuilder.cs b/Projects/Server/Buffers/ValueStringBuilder.cs index f9dc56bfa..8d990016a 100644 --- a/Projects/Server/Buffers/ValueStringBuilder.cs +++ b/Projects/Server/Buffers/ValueStringBuilder.cs @@ -375,7 +375,7 @@ namespace Server.Buffers ArrayPool.Shared.Return(toReturn); } } -#nullable disable +#nullable restore [MethodImpl(MethodImplOptions.AggressiveInlining)] public void ReplaceAny(ReadOnlySpan oldChars, ReadOnlySpan newChars, int startIndex, int count) diff --git a/Projects/Server/Collections/OrderedHashSet.cs b/Projects/Server/Collections/OrderedHashSet.cs index c1b1813e7..7eed4f1a3 100644 --- a/Projects/Server/Collections/OrderedHashSet.cs +++ b/Projects/Server/Collections/OrderedHashSet.cs @@ -535,7 +535,7 @@ namespace Server.Collections ++_version; return actualIndex; } -#nullable disable +#nullable restore // Returns the index of the next entry in the bucket [MethodImpl(MethodImplOptions.AggressiveInlining)] diff --git a/Projects/Server/Items/Item.cs b/Projects/Server/Items/Item.cs index 78fdb1a68..c6286d742 100644 --- a/Projects/Server/Items/Item.cs +++ b/Projects/Server/Items/Item.cs @@ -2442,7 +2442,7 @@ namespace Server ClearProperties(); } } -#nullable disable +#nullable restore public virtual int GetPacketFlags() { diff --git a/Projects/Server/Main.cs b/Projects/Server/Main.cs index ae35e91dd..4dd2c62a6 100644 --- a/Projects/Server/Main.cs +++ b/Projects/Server/Main.cs @@ -40,7 +40,7 @@ namespace Server private static TimeSpan _profileTime; #nullable enable private static bool? _isRunningFromXUnit; -#nullable disable +#nullable restore private static int _itemCount; private static int _mobileCount; @@ -80,7 +80,7 @@ namespace Server return false; } } -#nullable disable +#nullable restore public static bool Profiling { diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs index 1b3e9114e..3e0513301 100644 --- a/Projects/Server/Mobiles/Mobile.cs +++ b/Projects/Server/Mobiles/Mobile.cs @@ -7445,7 +7445,7 @@ namespace Server ClearProperties(); } } -#nullable disable +#nullable restore public virtual void SetLocation(Point3D newLocation, bool isTeleport) { diff --git a/Projects/UOContent/Commands/Object Creation/CAGObject.cs b/Projects/UOContent/Commands/Object Creation/CAGObject.cs index d5b82011c..6404cdb9d 100644 --- a/Projects/UOContent/Commands/Object Creation/CAGObject.cs +++ b/Projects/UOContent/Commands/Object Creation/CAGObject.cs @@ -30,7 +30,7 @@ namespace Server.Commands [JsonPropertyName("hue")] public int? Hue { get; set; } -#nullable disable +#nullable restore public CAGCategory Parent { get; set; }