From 6426996f296f6bc480594b8a63a6b45e9353e2f5 Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Thu, 10 Nov 2022 22:49:25 -0800
Subject: [PATCH] chore: Code Cleanup (#1239)

---
 Projects/Server.Tests/Tests/Text/TextDefinitionTests.cs     | 3 +--
 Projects/Server/AssemblyHandler.cs                          | 1 -
 Projects/Server/Geometry/Rectangle3D.cs                     | 1 -
 Projects/Server/Mobiles/Mobile.cs                           | 1 -
 Projects/Server/Network/Packets/IncomingTargetingPackets.cs | 6 +-----
 Projects/Server/Network/Packets/OutgoingTargetPackets.cs    | 5 ++++-
 Projects/Server/Serialization/GenericPersistence.cs         | 1 -
 Projects/Server/Timer/Timer.Pool.cs                         | 1 -
 Projects/Server/World/World.cs                              | 1 -
 .../UOContent/Items/Special/ML/GrizzledMareStatuette.cs     | 1 -
 10 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/Projects/Server.Tests/Tests/Text/TextDefinitionTests.cs b/Projects/Server.Tests/Tests/Text/TextDefinitionTests.cs
index 3ce35e350..8c72fb9cc 100644
--- a/Projects/Server.Tests/Tests/Text/TextDefinitionTests.cs
+++ b/Projects/Server.Tests/Tests/Text/TextDefinitionTests.cs
@@ -1,5 +1,4 @@
-using System;
-using Xunit;
+using Xunit;
 
 namespace Server.Tests;
 
diff --git a/Projects/Server/AssemblyHandler.cs b/Projects/Server/AssemblyHandler.cs
index 9ba3da8eb..d9f579191 100644
--- a/Projects/Server/AssemblyHandler.cs
+++ b/Projects/Server/AssemblyHandler.cs
@@ -14,7 +14,6 @@
  *************************************************************************/
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/Projects/Server/Geometry/Rectangle3D.cs b/Projects/Server/Geometry/Rectangle3D.cs
index 58d5059f6..ef9345c3f 100644
--- a/Projects/Server/Geometry/Rectangle3D.cs
+++ b/Projects/Server/Geometry/Rectangle3D.cs
@@ -14,7 +14,6 @@
  *************************************************************************/
 
 using System;
-using System.Buffers;
 
 namespace Server;
 
diff --git a/Projects/Server/Mobiles/Mobile.cs b/Projects/Server/Mobiles/Mobile.cs
index d11a12b0d..eb3594448 100644
--- a/Projects/Server/Mobiles/Mobile.cs
+++ b/Projects/Server/Mobiles/Mobile.cs
@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.Runtime.CompilerServices;
 using Server.Accounting;
 using Server.Buffers;
-using Server.Collections;
 using Server.ContextMenus;
 using Server.Guilds;
 using Server.Gumps;
diff --git a/Projects/Server/Network/Packets/IncomingTargetingPackets.cs b/Projects/Server/Network/Packets/IncomingTargetingPackets.cs
index 27dd1c251..c1b2ee844 100644
--- a/Projects/Server/Network/Packets/IncomingTargetingPackets.cs
+++ b/Projects/Server/Network/Packets/IncomingTargetingPackets.cs
@@ -61,11 +61,7 @@ public static class IncomingTargetingPackets
                 // User pressed escape
                 t.Cancel(from, TargetCancelType.Canceled);
             }
-            else if (t.TargetID != targetID)
-            {
-                // Sanity, prevent fake target
-            }
-            else
+            else if (t.TargetID == targetID)
             {
                 object toTarget;
 
diff --git a/Projects/Server/Network/Packets/OutgoingTargetPackets.cs b/Projects/Server/Network/Packets/OutgoingTargetPackets.cs
index ac33da781..1ddbaa68b 100644
--- a/Projects/Server/Network/Packets/OutgoingTargetPackets.cs
+++ b/Projects/Server/Network/Packets/OutgoingTargetPackets.cs
@@ -48,7 +48,10 @@ public static class OutgoingTargetPackets
     public static void SendCancelTarget(this NetState ns) =>
         ns?.Send(stackalloc byte[]
         {
-            0x6C, 0x0, 0x0, 0x0, 0x0, 0x0, 0x3, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0
+            0x6C, 0x0, 0x0, 0x0, 0x0,
+            0x0, 0x3, 0x0, 0x0, 0x0,
+            0x0, 0x0, 0x0, 0x0, 0x0,
+            0x0, 0x0, 0x0, 0x0
         });
 
     public static void SendTargetReq(this NetState ns, Target t)
diff --git a/Projects/Server/Serialization/GenericPersistence.cs b/Projects/Server/Serialization/GenericPersistence.cs
index 66d52fdc2..b567edba0 100644
--- a/Projects/Server/Serialization/GenericPersistence.cs
+++ b/Projects/Server/Serialization/GenericPersistence.cs
@@ -14,7 +14,6 @@
  *************************************************************************/
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/Projects/Server/Timer/Timer.Pool.cs b/Projects/Server/Timer/Timer.Pool.cs
index ed02dfe7d..eb07d9d5d 100644
--- a/Projects/Server/Timer/Timer.Pool.cs
+++ b/Projects/Server/Timer/Timer.Pool.cs
@@ -14,7 +14,6 @@
  *************************************************************************/
 
 using System;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace Server;
diff --git a/Projects/Server/World/World.cs b/Projects/Server/World/World.cs
index ec832de72..9f323bef1 100644
--- a/Projects/Server/World/World.cs
+++ b/Projects/Server/World/World.cs
@@ -20,7 +20,6 @@ using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 using System.Threading;
 using Server.Guilds;
 using Server.Logging;
diff --git a/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs b/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs
index 1a2bb8ea1..1e460e1e3 100644
--- a/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs
+++ b/Projects/UOContent/Items/Special/ML/GrizzledMareStatuette.cs
@@ -1,4 +1,3 @@
-using System;
 using Server.Mobiles;
 
 namespace Server.Items