Cleanup & Fixes for .NET 5 (#309)

- [X] Fixes several bugs
- [X] Updates more ordinal issues
- [X] Cleans up the code a bit
- [X] Turns classes static that should have been
- [X] Changes TcpServer.Instances to a HashSet

Bumps release version

Projects/UOContent/Items/Containers/Container.cs

@@ -597,8 +597,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x9AA, 0xE7D)]
+    [Furniture, Flippable(0x9AA, 0xE7D)]
     public class WoodenBox : LockableContainer
     {
         [Constructible]
@@ -623,8 +622,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x9A9, 0xE7E)]
+    [Furniture, Flippable(0x9A9, 0xE7E)]
     public class SmallCrate : LockableContainer
     {
         [Constructible]
@@ -654,8 +652,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xE3F, 0xE3E)]
+    [Furniture, Flippable(0xE3F, 0xE3E)]
     public class MediumCrate : LockableContainer
     {
         [Constructible]
@@ -685,8 +682,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xE3D, 0xE3C)]
+    [Furniture, Flippable(0xE3D, 0xE3C)]
     public class LargeCrate : LockableContainer
     {
         [Constructible]
@@ -716,8 +712,7 @@ namespace Server.Items
         }
     }
 
-    [DynamicFliping]
-    [Flippable(0x9A8, 0xE80)]
+    [DynamicFliping, Flippable(0x9A8, 0xE80)]
     public class MetalBox : LockableContainer
     {
         [Constructible]
@@ -749,8 +744,7 @@ namespace Server.Items
         }
     }
 
-    [DynamicFliping]
-    [Flippable(0x9AB, 0xE7C)]
+    [DynamicFliping, Flippable(0x9AB, 0xE7C)]
     public class MetalChest : LockableContainer
     {
         [Constructible]
@@ -782,8 +776,7 @@ namespace Server.Items
         }
     }
 
-    [DynamicFliping]
-    [Flippable(0xE41, 0xE40)]
+    [DynamicFliping, Flippable(0xE41, 0xE40)]
     public class MetalGoldenChest : LockableContainer
     {
         [Constructible]
@@ -815,8 +808,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xe43, 0xe42)]
+    [Furniture, Flippable(0xe43, 0xe42)]
     public class WoodenChest : LockableContainer
     {
         [Constructible]
@@ -846,8 +838,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x280B, 0x280C)]
+    [Furniture, Flippable(0x280B, 0x280C)]
     public class PlainWoodenChest : LockableContainer
     {
         [Constructible]
@@ -879,8 +870,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x280D, 0x280E)]
+    [Furniture, Flippable(0x280D, 0x280E)]
     public class OrnateWoodenChest : LockableContainer
     {
         [Constructible]
@@ -912,8 +902,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x280F, 0x2810)]
+    [Furniture, Flippable(0x280F, 0x2810)]
     public class GildedWoodenChest : LockableContainer
     {
         [Constructible]
@@ -945,8 +934,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x2811, 0x2812)]
+    [Furniture, Flippable(0x2811, 0x2812)]
     public class WoodenFootLocker : LockableContainer
     {
         [Constructible]
@@ -981,8 +969,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x2813, 0x2814)]
+    [Furniture, Flippable(0x2813, 0x2814)]
     public class FinishedWoodenChest : LockableContainer
     {
         [Constructible]

Projects/UOContent/Items/Containers/FillableContainers.cs

@@ -792,9 +792,7 @@ namespace Server.Items
 
         public static FillableContent ArtisanGuild = new FillableContent(
             1,
-            new Type[]
-            {
-            },
+            Array.Empty<Type>(),
             new[]
             {
                 new FillableEntry(1, typeof(PaintsAndBrush)),
@@ -1047,9 +1045,7 @@ namespace Server.Items
 
         public static FillableContent Guard = new FillableContent(
             3,
-            new Type[]
-            {
-            },
+            Array.Empty<Type>(),
             new[]
             {
                 new FillableEntry(12, Loot.ArmorTypes),
@@ -1095,9 +1091,7 @@ namespace Server.Items
 
         public static FillableContent Inn = new FillableContent(
             1,
-            new Type[]
-            {
-            },
+            Array.Empty<Type>(),
             new[]
             {
                 new FillableEntry(1, typeof(Candle)),
@@ -1223,9 +1217,7 @@ namespace Server.Items
 
         public static FillableContent Mill = new FillableContent(
             1,
-            new Type[]
-            {
-            },
+            Array.Empty<Type>(),
             new[]
             {
                 new FillableEntry(1, typeof(SackFlour))
@@ -1250,9 +1242,7 @@ namespace Server.Items
 
         public static FillableContent Observatory = new FillableContent(
             1,
-            new Type[]
-            {
-            },
+            Array.Empty<Type>(),
             new[]
             {
                 new FillableEntry(2, typeof(Sextant)),
@@ -1263,9 +1253,7 @@ namespace Server.Items
 
         public static FillableContent Painter = new FillableContent(
             1,
-            new Type[]
-            {
-            },
+            Array.Empty<Type>(),
             new[]
             {
                 new FillableEntry(1, typeof(PaintsAndBrush)),

Projects/UOContent/Items/Containers/FurnitureContainer.cs

@@ -3,8 +3,7 @@ using System.Collections.Generic;
 
 namespace Server.Items
 {
-    [Furniture]
-    [Flippable(0x2815, 0x2816)]
+    [Furniture, Flippable(0x2815, 0x2816)]
     public class TallCabinet : BaseContainer
     {
         [Constructible]
@@ -27,8 +26,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x2817, 0x2818)]
+    [Furniture, Flippable(0x2817, 0x2818)]
     public class ShortCabinet : BaseContainer
     {
         [Constructible]
@@ -51,8 +49,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x2857, 0x2858)]
+    [Furniture, Flippable(0x2857, 0x2858)]
     public class RedArmoire : BaseContainer
     {
         [Constructible]
@@ -75,8 +72,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x285D, 0x285E)]
+    [Furniture, Flippable(0x285D, 0x285E)]
     public class CherryArmoire : BaseContainer
     {
         [Constructible]
@@ -99,8 +95,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x285B, 0x285C)]
+    [Furniture, Flippable(0x285B, 0x285C)]
     public class MapleArmoire : BaseContainer
     {
         [Constructible]
@@ -123,8 +118,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0x2859, 0x285A)]
+    [Furniture, Flippable(0x2859, 0x285A)]
     public class ElegantArmoire : BaseContainer
     {
         [Constructible]
@@ -147,8 +141,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xa97, 0xa99, 0xa98, 0xa9a, 0xa9b, 0xa9c)]
+    [Furniture, Flippable(0xa97, 0xa99, 0xa98, 0xa9a, 0xa9b, 0xa9c)]
     public class FullBookcase : BaseContainer
     {
         [Constructible]
@@ -171,8 +164,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xa9d, 0xa9e)]
+    [Furniture, Flippable(0xa9d, 0xa9e)]
     public class EmptyBookcase : BaseContainer
     {
         [Constructible]
@@ -203,8 +195,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xa2c, 0xa34)]
+    [Furniture, Flippable(0xa2c, 0xa34)]
     public class Drawer : BaseContainer
     {
         [Constructible]
@@ -227,8 +218,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xa30, 0xa38)]
+    [Furniture, Flippable(0xa30, 0xa38)]
     public class FancyDrawer : BaseContainer
     {
         [Constructible]
@@ -251,8 +241,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xa4f, 0xa53)]
+    [Furniture, Flippable(0xa4f, 0xa53)]
     public class Armoire : BaseContainer
     {
         [Constructible]
@@ -285,8 +274,7 @@ namespace Server.Items
         }
     }
 
-    [Furniture]
-    [Flippable(0xa4d, 0xa51)]
+    [Furniture, Flippable(0xa4d, 0xa51)]
     public class FancyArmoire : BaseContainer
     {
         [Constructible]
@@ -319,7 +307,7 @@ namespace Server.Items
         }
     }
 
-    public class DynamicFurniture
+    public static class DynamicFurniture
     {
         private static readonly Dictionary<Container, Timer> m_Table = new Dictionary<Container, Timer>();
 

Projects/UOContent/Items/Containers/MarkContainer.cs

@@ -97,8 +97,7 @@ namespace Server.Items
             CommandSystem.Register("SecretLocGen", AccessLevel.Administrator, SecretLocGen_OnCommand);
         }
 
-        [Usage("SecretLocGen")]
-        [Description("Generates mark containers to Malas secret locations.")]
+        [Usage("SecretLocGen"), Description("Generates mark containers to Malas secret locations.")]
         public static void SecretLocGen_OnCommand(CommandEventArgs e)
         {
             CreateMalasPassage(951, 546, -70, 1006, 994, -70, false, false);

Projects/UOContent/Items/Containers/TrappableContainer.cs

@@ -102,7 +102,7 @@ namespace Server.Items
                                 from.LocalOverheadMessage(MessageType.Regular, 0x2A, 503000);
                             }
 
-                            Effects.SendLocationEffect(loc, facet, 0x36BD, 15, 10);
+                            Effects.SendLocationEffect(loc, facet, 0x36BD, 15);
                             Effects.PlaySound(loc, facet, 0x307);
 
                             break;