fix(core): Removes disposable netstates. (#467)

- [X] Removes IDisposable from NetState
- [X] Swaps Disconnect and Dispose methods

Projects/Server.Tests/Helpers/PacketTestUtilities.cs

@@ -24,11 +24,5 @@ namespace Server.Tests.Network
 
             return new NetState(socket.Object);
         }
-
-        public static Map CreateTestMap()
-        {
-            var map = new Mock<Map>();
-            return map.Object;
-        }
     }
 }

Projects/Server.Tests/Tests/Network/Packets/Outgoing/AccountPacketTests.cs

@@ -51,7 +51,7 @@ namespace Server.Tests.Network
             // var account = new MockAccount(new[] { firstMobile, null, secondMobile });
             var expected = new ChangeCharacter(account).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendChangeCharacter(account);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -63,7 +63,7 @@ namespace Server.Tests.Network
         {
             var expected = new ClientVersionReq().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
 
             ns.SendClientVersionRequest();
 
@@ -76,7 +76,7 @@ namespace Server.Tests.Network
         {
             var expected = new DeleteResult(DeleteResultType.BadRequest).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCharacterDeleteResult(DeleteResultType.BadRequest);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -88,7 +88,7 @@ namespace Server.Tests.Network
         {
             var expected = new PopupMessage(PMMessage.LoginSyncError).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPopupMessage(PMMessage.LoginSyncError);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -109,7 +109,7 @@ namespace Server.Tests.Network
             account[3] = null;
             account[4] = null;
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.Account = account;
             ns.ProtocolChanges = protocolChanges;
 
@@ -134,7 +134,7 @@ namespace Server.Tests.Network
 
             var expected = new LoginConfirm(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendLoginConfirmation(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -146,7 +146,7 @@ namespace Server.Tests.Network
         {
             var expected = new LoginComplete().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendLoginComplete();
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -169,7 +169,7 @@ namespace Server.Tests.Network
 
             var expected = new CharacterListUpdate(account).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCharacterListUpdate(account);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -197,7 +197,7 @@ namespace Server.Tests.Network
 
             var expected = new CharacterList(account, info).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.CityInfo = info;
             ns.Account = account;
             ns.ProtocolChanges = ProtocolChanges.Version70130;
@@ -229,7 +229,7 @@ namespace Server.Tests.Network
 
             var expected = new CharacterListOld(account, info).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.CityInfo = info;
             ns.Account = account;
 
@@ -245,7 +245,7 @@ namespace Server.Tests.Network
             var reason = ALRReason.BadComm;
             var expected = new AccountLoginRej(reason).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendAccountLoginRejected(reason);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -262,7 +262,7 @@ namespace Server.Tests.Network
 
             var expected = new AccountLoginAck(info).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ServerInfo = info;
 
             ns.SendAccountLoginAck();
@@ -279,7 +279,7 @@ namespace Server.Tests.Network
 
             var expected = new PlayServerAck(si, authId).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
 
             ns.SendPlayServerAck(si, authId);
 

Projects/Server.Tests/Tests/Network/Packets/Outgoing/CombatPacketTests.cs

@@ -14,7 +14,7 @@ namespace Server.Tests.Network
 
             var expected = new Swing(attacker, defender).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSwing(attacker, defender);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -26,7 +26,7 @@ namespace Server.Tests.Network
         {
             var expected = new SetWarMode(warmode).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSetWarMode(warmode);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -40,7 +40,7 @@ namespace Server.Tests.Network
 
             var expected = new ChangeCombatant(serial).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendChangeCombatant(serial);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/ContainerPacketTests.cs

@@ -17,7 +17,7 @@ namespace Server.Tests.Network
 
             var expected = new ContainerDisplay(serial, gumpId).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayContainer(serial, gumpId);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -32,7 +32,7 @@ namespace Server.Tests.Network
 
             var expected = new ContainerDisplayHS(serial, gumpId).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ns.ProtocolChanges | ProtocolChanges.ContainerGridLines | ProtocolChanges.HighSeas;
             ns.SendDisplayContainer(serial, gumpId);
 
@@ -47,7 +47,7 @@ namespace Server.Tests.Network
 
             var expected = new DisplaySpellbook(serial).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplaySpellbook(serial);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -61,7 +61,7 @@ namespace Server.Tests.Network
 
             var expected = new DisplaySpellbookHS(serial).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ns.ProtocolChanges | ProtocolChanges.ContainerGridLines | ProtocolChanges.HighSeas;
             ns.SendDisplaySpellbook(serial);
 
@@ -80,7 +80,7 @@ namespace Server.Tests.Network
 
             var expected = new NewSpellbookContent(serial, graphic, offset, content).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ns.ProtocolChanges | ProtocolChanges.ContainerGridLines | ProtocolChanges.NewSpellbook;
             ObjectPropertyList.Enabled = true;
             ns.SendSpellbookContent(serial, graphic, offset, content);
@@ -100,7 +100,7 @@ namespace Server.Tests.Network
 
             var expected = new SpellbookContent(serial, offset, content).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSpellbookContent(serial, graphic, offset, content);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -117,7 +117,7 @@ namespace Server.Tests.Network
 
             var expected = new SpellbookContent6017(serial, offset, content).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
             ns.SendSpellbookContent(serial, graphic, offset, content);
 
@@ -133,7 +133,7 @@ namespace Server.Tests.Network
 
             var expected = new ContainerContentUpdate(item).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendContainerContentUpdate(item);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -148,7 +148,7 @@ namespace Server.Tests.Network
 
             var expected = new ContainerContentUpdate6017(item).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
             ns.SendContainerContentUpdate(item);
 
@@ -170,7 +170,7 @@ namespace Server.Tests.Network
 
             var expected = new ContainerContent(m, cont).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendContainerContent(m, cont);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -191,7 +191,7 @@ namespace Server.Tests.Network
 
             var expected = new ContainerContent6017(m, cont).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
             ns.SendContainerContent(m, cont);
 

Projects/Server.Tests/Tests/Network/Packets/Outgoing/DamagePacketTests.cs

@@ -13,7 +13,7 @@ namespace Server.Tests.Network
 
             var expected = new DamagePacketOld(serial, inputAmount).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDamage(serial, inputAmount);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -27,7 +27,7 @@ namespace Server.Tests.Network
 
             var expected = new DamagePacket(serial, inputAmount).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ProtocolChanges.DamagePacket;
 
             ns.SendDamage(serial, inputAmount);

Projects/Server.Tests/Tests/Network/Packets/Outgoing/EffectPacketTests.cs

@@ -13,7 +13,7 @@ namespace Server.Tests.Network
 
             var expected = new PlaySound(soundID, p).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSoundEffect(soundID, p);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -95,7 +95,7 @@ namespace Server.Tests.Network
         {
             var expected = new ScreenEffect(screenType).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendScreenEffect(screenType);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/EquipmentPacketTests.cs

@@ -33,7 +33,7 @@ namespace Server.Tests.Network
 
             var expected = new DisplayEquipmentInfo(item, info).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayEquipmentInfo(
                 item.Serial,
                 info.Number,
@@ -56,7 +56,7 @@ namespace Server.Tests.Network
 
             var expected = new EquipUpdate(item).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendEquipUpdate(item);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/GumpPacketTests.cs

@@ -13,7 +13,7 @@ namespace Server.Tests.Network
         {
             var expected = new CloseGump(typeId, buttonId).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCloseGump(typeId, buttonId);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -30,7 +30,7 @@ namespace Server.Tests.Network
 
             var expected = new DisplaySignGump(gumpSerial, gumpId, unknownString, caption).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplaySignGump(gumpSerial, gumpId, unknownString, caption);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -44,7 +44,7 @@ namespace Server.Tests.Network
         {
             var gump = new NameChangeDeedGump();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = gump.Compile(ns).Compile();
@@ -67,7 +67,7 @@ namespace Server.Tests.Network
 
             var gump = new AdminGump(m, AdminGumpPage.Clients);
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = gump.Compile(ns).Compile();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/ItemPacketTests.cs

@@ -34,7 +34,7 @@ namespace Server.Tests.Network
 
             var expected = new WorldItem(item).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendWorldItem(item);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -68,7 +68,7 @@ namespace Server.Tests.Network
 
             var expected = new WorldItemSA(item).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ProtocolChanges.StygianAbyss;
             ns.SendWorldItem(item);
 
@@ -103,7 +103,7 @@ namespace Server.Tests.Network
 
             var expected = new WorldItemHS(item).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ProtocolChanges.StygianAbyss | ProtocolChanges.HighSeas;
             ns.SendWorldItem(item);
 

Projects/Server.Tests/Tests/Network/Packets/Outgoing/LightPacketTests.cs

@@ -12,7 +12,7 @@ namespace Server.Tests.Network
             byte lightLevel = 5;
             var expected = new GlobalLightLevel(lightLevel).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendGlobalLightLevel(lightLevel);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -26,7 +26,7 @@ namespace Server.Tests.Network
             byte lightLevel = 5;
             var expected = new PersonalLightLevel(serial, lightLevel).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPersonalLightLevel(serial, lightLevel);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/MapPacketTests.cs

@@ -11,7 +11,7 @@ namespace Server.Tests.Network
         {
             var expected = new MapPatches().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMapPatches();
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -23,7 +23,7 @@ namespace Server.Tests.Network
         {
             var expected = new InvalidMapEnable().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendInvalidMap();
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -38,7 +38,7 @@ namespace Server.Tests.Network
             var map = Map.Parse(mapName);
             var expected = new MapChange(map).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMapChange(map);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/MenuPacketTests.cs

@@ -46,7 +46,7 @@ namespace Server.Tests.Network
 
             var expected = new DisplayItemListMenu(menu).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayItemListMenu(menu);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -67,7 +67,7 @@ namespace Server.Tests.Network
             );
 
             var expected = new DisplayQuestionMenu(menu).Compile();
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayQuestionMenu(menu);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -90,7 +90,7 @@ namespace Server.Tests.Network
             var packet = newHaven && newPacket ? (Packet)new DisplayContextMenu(menu) : new DisplayContextMenuOld(menu);
             var expected = packet.Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             if (newHaven)
             {
                 ns.ProtocolChanges |= ProtocolChanges.NewHaven;

Projects/Server.Tests/Tests/Network/Packets/Outgoing/MessagePacketTests.cs

@@ -30,7 +30,7 @@ namespace Server.Tests.Network
                 args
             ).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMessageLocalized(
                 serial,
                 graphic,
@@ -73,7 +73,7 @@ namespace Server.Tests.Network
                 args
             ).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMessageLocalizedAffix(
                 serial,
                 graphic,
@@ -112,7 +112,7 @@ namespace Server.Tests.Network
                 text
             ).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMessage(
                 serial,
                 graphic,
@@ -152,7 +152,7 @@ namespace Server.Tests.Network
                 text
             ).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMessage(
                 serial,
                 graphic,
@@ -177,7 +177,7 @@ namespace Server.Tests.Network
 
             var expected = new FollowMessage(serial, serial2).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendFollowMessage(serial, serial2);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -192,7 +192,7 @@ namespace Server.Tests.Network
 
             var expected = new ObjectHelpResponse(s, text).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendHelpResponse(s, text);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -211,7 +211,7 @@ namespace Server.Tests.Network
                 var prompt = new TestPrompt();
                 var expected = new UnicodePrompt(prompt).Compile();
 
-                using var ns = PacketTestUtilities.CreateTestNetState();
+                var ns = PacketTestUtilities.CreateTestNetState();
                 ns.SendPrompt(prompt);
 
                 var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/MobilePacketTests.cs

@@ -14,7 +14,7 @@ namespace Server.Tests.Network
 
             var expected = new DeathAnimation(killed, corpse).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDeathAnimation(killed, corpse);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -29,7 +29,7 @@ namespace Server.Tests.Network
 
             var expected = new BondedStatus(petSerial, bonded).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendBondedStatus(petSerial, bonded);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -46,7 +46,7 @@ namespace Server.Tests.Network
 
             var noto = 10;
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = protocolChanges;
             var expected = new MobileMoving(m, noto, ns.StygianAbyss).Compile();
 
@@ -67,7 +67,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileName(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileName(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -91,7 +91,7 @@ namespace Server.Tests.Network
                 delay
             ).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileAnimation(
                 mobile,
                 action,
@@ -120,7 +120,7 @@ namespace Server.Tests.Network
                 delay
             ).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendNewMobileAnimation(
                 mobile,
                 action,
@@ -145,7 +145,7 @@ namespace Server.Tests.Network
 
             var expected = new HealthbarPoison(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileHealthbar(m, Healthbar.Poison);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -166,7 +166,7 @@ namespace Server.Tests.Network
 
             var expected = new HealthbarYellow(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileHealthbar(m, Healthbar.Yellow);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -189,7 +189,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileStatusCompact(canBeRenamed, m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileStatusCompact(m, canBeRenamed);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -220,7 +220,7 @@ namespace Server.Tests.Network
             beheld.Dex = 25;
             beheld.Stam = 100;
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = new MobileStatus(beholder, beheld, ns).Compile();
@@ -245,7 +245,7 @@ namespace Server.Tests.Network
             m.Dex = 25;
             m.Stam = 100;
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = new MobileStatusExtended(m, ns).Compile();
@@ -264,7 +264,7 @@ namespace Server.Tests.Network
             m.DefaultMobileInit();
             m.SolidHueOverride = solidHueOverride;
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = new MobileUpdate(m, ns.StygianAbyss).Compile();
@@ -319,7 +319,7 @@ namespace Server.Tests.Network
             beheld.FacialHairItemID = facialHairItemId;
             beheld.FacialHairHue = facialHairHue;
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = new MobileIncoming(ns, beholder, beheld).Compile();
@@ -343,7 +343,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileHits(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileHits(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -360,7 +360,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileHitsN(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileHits(m, true);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -377,7 +377,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileMana(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileMana(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -394,7 +394,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileManaN(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileMana(m, true);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -411,7 +411,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileStam(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileStam(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -428,7 +428,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileStamN(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileStam(m, true);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -449,7 +449,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileAttributes(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileAttributes(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -470,7 +470,7 @@ namespace Server.Tests.Network
 
             var expected = new MobileAttributesN(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMobileAttributes(m, true);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -483,7 +483,7 @@ namespace Server.Tests.Network
             Serial e = 0x1000;
             var expected = new RemoveEntity(e).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendRemoveEntity(e);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/MovementPacketTests.cs

@@ -14,7 +14,7 @@ namespace Server.Tests.Network
         {
             var expected = new SpeedControl(speedControl).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSpeedControl((SpeedControlSetting)speedControl);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -27,7 +27,7 @@ namespace Server.Tests.Network
             const Direction d = Direction.Left;
             var expected = new MovePlayer(d).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMovePlayer(d);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -44,7 +44,7 @@ namespace Server.Tests.Network
 
             var expected = new MovementRej(seq, m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMovementRej(seq, m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -61,7 +61,7 @@ namespace Server.Tests.Network
 
             var expected = MovementAck.Instantiate(seq, m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMovementAck(seq, m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -73,7 +73,7 @@ namespace Server.Tests.Network
         {
             var expected = new NullFastwalkStack().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendInitialFastwalkStack(new uint[]{ 0, 0, 0, 0, 0, 0 });
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/PlayerPacketTests.cs

@@ -19,7 +19,7 @@ namespace Server.Tests.Network
 
             var expected = new StatLockInfo(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendStatLockInfo(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -34,7 +34,7 @@ namespace Server.Tests.Network
         {
             var expected = new ChangeUpdateRange(range).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendChangeUpdateRange((byte)range);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -48,7 +48,7 @@ namespace Server.Tests.Network
         {
             var expected = new DeathStatus(dead).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDeathStatus(dead);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -64,7 +64,7 @@ namespace Server.Tests.Network
         {
             var expected = new ToggleSpecialAbility(abilityId, active).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendToggleSpecialAbility(abilityId, active);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -79,7 +79,7 @@ namespace Server.Tests.Network
             Serial m = serial;
             var expected = new DisplayProfile(m, header, body, footer).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayProfile(m, header, body, footer);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -93,7 +93,7 @@ namespace Server.Tests.Network
         {
             var expected = new LiftRej(reason).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendLiftReject(reason);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -105,7 +105,7 @@ namespace Server.Tests.Network
         {
             var expected = new LogoutAck().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendLogoutAck();
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -120,7 +120,7 @@ namespace Server.Tests.Network
         {
             var expected = new Weather(type, density, temp).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendWeather((byte)type, (byte)density, (byte)temp);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -135,7 +135,7 @@ namespace Server.Tests.Network
             var map = Map.Maps[mapID];
             var expected = new ServerChange(p, map).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendServerChange(p, map);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -153,7 +153,7 @@ namespace Server.Tests.Network
 
             var expected = new SkillUpdate(skills).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSkillsUpdate(skills);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -168,7 +168,7 @@ namespace Server.Tests.Network
         {
             var expected = new Sequence(num).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSequence(num);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -190,7 +190,7 @@ namespace Server.Tests.Network
 
             var expected = new SkillChange(skill).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSkillChange(skill);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -206,7 +206,7 @@ namespace Server.Tests.Network
         {
             var expected = new LaunchBrowser(uri).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendLaunchBrowser(uri);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -226,7 +226,7 @@ namespace Server.Tests.Network
 
             var expected = new DragEffect(src, targ, itemId, hue, amount).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDragEffect(
                 src.Serial, src.Location,
                 targ.Serial, targ.Location,
@@ -244,7 +244,7 @@ namespace Server.Tests.Network
         {
             var expected = new SeasonChange(season, playSound).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSeasonChange((byte)season, playSound);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -259,7 +259,7 @@ namespace Server.Tests.Network
         {
             var expected = new DisplayPaperdoll(m, title, warmode, canLift).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayPaperdoll(m, title, warmode, canLift);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -274,7 +274,7 @@ namespace Server.Tests.Network
         {
             var expected = new PlayMusic(music).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPlayMusic(music);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -288,7 +288,7 @@ namespace Server.Tests.Network
         {
             var expected = new ScrollMessage(type, tip, text).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendScrollMessage(type, tip ,text);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -302,7 +302,7 @@ namespace Server.Tests.Network
             var date = new DateTime(2020, 1, 1, hour, minute, second);
             var expected = new CurrentTime(date).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCurrentTime(date);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -316,7 +316,7 @@ namespace Server.Tests.Network
             var p = new Point3D(x, y, z);
             var expected = new PathfindMessage(p).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPathfindMessage(p);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -331,7 +331,7 @@ namespace Server.Tests.Network
         {
             var expected = new PingAck(ping).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPingAck(ping);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -343,7 +343,7 @@ namespace Server.Tests.Network
         {
             var expected = new ClearWeaponAbility().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendClearWeaponAbility();
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -358,7 +358,7 @@ namespace Server.Tests.Network
 
             var expected = new DisplayHuePicker(huePicker).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayHuePicker(huePicker.Serial, huePicker.ItemID);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/SecureTradePacketTests.cs

@@ -20,7 +20,7 @@ namespace Server.Tests.Network
 
             var expected = new DisplaySecureTrade(m, firstCont, secondCont, name).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplaySecureTrade(m, firstCont, secondCont, name);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -34,7 +34,7 @@ namespace Server.Tests.Network
 
             var expected = new CloseSecureTrade(cont).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCloseSecureTrade(cont);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -52,7 +52,7 @@ namespace Server.Tests.Network
             var cont = first ? firstCont : secondCont;
             var expected = new UpdateSecureTrade(cont, first, second).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendUpdateSecureTrade(cont, first, second);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -67,7 +67,7 @@ namespace Server.Tests.Network
             var cont = new Container(World.NewItem);
             var expected = new UpdateSecureTrade(cont, flag, gold, plat).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendUpdateSecureTrade(cont, flag, gold, plat);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -85,7 +85,7 @@ namespace Server.Tests.Network
 
             var expected = new SecureTradeEquip(itemInCont, m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSecureTradeEquip(itemInCont, m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -103,7 +103,7 @@ namespace Server.Tests.Network
 
             var expected = new SecureTradeEquip6017(itemInCont, m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges |= ProtocolChanges.ContainerGridLines;
 
             ns.SendSecureTradeEquip(itemInCont, m);

Projects/Server.Tests/Tests/Network/Packets/Outgoing/TargetPacketsTests.cs

@@ -40,7 +40,7 @@ namespace Server.Tests.Network
 
             var expected = new MultiTargetReqHS(t).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges |= ProtocolChanges.HighSeas;
             ns.SendMultiTargetReq(t);
 
@@ -57,7 +57,7 @@ namespace Server.Tests.Network
 
             var expected = new MultiTargetReq(t).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMultiTargetReq(t);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -68,7 +68,7 @@ namespace Server.Tests.Network
         public void TestCancelTarget()
         {
             var expected = new CancelTarget().Compile();
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCancelTarget();
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -81,7 +81,7 @@ namespace Server.Tests.Network
             var t = new TestTarget(10, true, TargetFlags.Beneficial);
             var expected = new TargetReq(t).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendTargetReq(t);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorBuyPacketTests.cs

@@ -22,7 +22,7 @@ namespace Server.Tests.Network
                 new("Third Item", cont.Serial, World.NewItem, 30, 10, 0x0F, 0)
             };
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = protocolChanges;
 
             var expected = new VendorBuyContent(buyStates, ns.ContainerGridLines).Compile();
@@ -41,7 +41,7 @@ namespace Server.Tests.Network
             var vendor = new Mobile(0x1);
             vendor.DefaultMobileInit();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = protocolChanges;
 
             var expected = new DisplayBuyList(vendor.Serial, ns.HighSeas).Compile();
@@ -69,7 +69,7 @@ namespace Server.Tests.Network
 
             var expected = new VendorBuyList(vendor, buyStates).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendVendorBuyList(vendor, buyStates);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -84,7 +84,7 @@ namespace Server.Tests.Network
 
             var expected = new EndVendorBuy(vendor.Serial).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendEndVendorBuy(vendor.Serial);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/VendorSellPacketTests.cs

@@ -26,7 +26,7 @@ namespace Server.Tests.Network
 
             var expected = new VendorSellList(vendor, sellStates).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendVendorSellList(vendor.Serial, sellStates);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -41,7 +41,7 @@ namespace Server.Tests.Network
 
             var expected = new EndVendorBuy(vendor.Serial).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendEndVendorSell(vendor.Serial);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server.Tests/Tests/Network/Packets/Outgoing/VirtualHairPacketTests.cs

@@ -15,7 +15,7 @@ namespace Server.Tests
 
             var expected = new HairEquipUpdate(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendHairEquipUpdatePacket(m, HairInfo.FakeSerial(m.Serial), Layer.Hair);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -30,7 +30,7 @@ namespace Server.Tests
 
             var expected = new RemoveHair(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendRemoveHairPacket(HairInfo.FakeSerial(m.Serial));
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/Server/Mobiles/Mobile.cs

@@ -2711,7 +2711,7 @@ namespace Server
             if (m_NetState != null)
             {
                 m_NetState.CancelAllTrades();
-                m_NetState.Dispose();
+                m_NetState.Disconnect();
             }
 
             DropHolding();

Projects/Server/Network/NetState/NetState.cs

@@ -35,7 +35,7 @@ namespace Server.Network
     public delegate void DecodePacket(CircularBuffer<byte> buffer, ref int length);
     public delegate void EncodePacket(ReadOnlySpan<byte> inputBuffer, CircularBuffer<byte> outputBuffer, out int length);
 
-    public partial class NetState : IComparable<NetState>, IDisposable
+    public partial class NetState : IComparable<NetState>
     {
         private static int RecvPipeSize = 1024 * 64 + 1;
         private static int SendPipeSize = 1024 * 256 + 1;
@@ -270,7 +270,7 @@ namespace Server.Network
             else
             {
                 WriteConsole("Exceeded menu cap, disconnecting...");
-                Dispose();
+                Disconnect();
             }
         }
 
@@ -300,7 +300,7 @@ namespace Server.Network
             else
             {
                 WriteConsole("Exceeded hue picker cap, disconnecting...");
-                Dispose();
+                Disconnect();
             }
         }
 
@@ -330,7 +330,7 @@ namespace Server.Network
             else
             {
                 WriteConsole("Exceeded gump cap, disconnecting...");
-                Dispose();
+                Disconnect();
             }
         }
 
@@ -413,7 +413,7 @@ namespace Server.Network
                 Console.WriteLine(ex);
                 TraceException(ex);
 #endif
-                Dispose();
+                Disconnect();
             }
         }
 
@@ -454,7 +454,7 @@ namespace Server.Network
                     else
                     {
                         WriteConsole("Too much data pending, disconnecting...");
-                        Dispose();
+                        Disconnect();
                     }
                 }
                 else
@@ -468,7 +468,7 @@ namespace Server.Network
                 Console.WriteLine(ex);
                 TraceException(ex);
 #endif
-                Dispose();
+                Disconnect();
             }
             finally
             {
@@ -526,7 +526,7 @@ namespace Server.Network
             }
             finally
             {
-                Dispose();
+                Disconnect();
             }
         }
 
@@ -585,7 +585,7 @@ namespace Server.Network
             }
             finally
             {
-                Dispose();
+                Disconnect();
             }
         }
 
@@ -633,7 +633,7 @@ namespace Server.Network
                         // TODO: Throw exception instead?
                         if (bytesProcessed < 0)
                         {
-                            Dispose();
+                            Disconnect();
                             return false;
                         }
 
@@ -649,7 +649,7 @@ namespace Server.Network
                 Console.WriteLine(ex);
                 TraceException(ex);
 #endif
-                Dispose();
+                Disconnect();
                 return false;
             }
         }
@@ -675,7 +675,7 @@ namespace Server.Network
 
             while (Disposed.TryDequeue(out var ns))
             {
-                ns.Disconnect();
+                ns.Dispose();
                 TcpServer.Instances.Remove(ns);
                 count++;
             }
@@ -688,7 +688,7 @@ namespace Server.Network
             if (Connection != null && _nextActivityCheck - curTicks < 0)
             {
                 WriteConsole("Disconnecting due to inactivity...");
-                Dispose();
+                Disconnect();
             }
         }
 
@@ -715,7 +715,7 @@ namespace Server.Network
                 packetID != 0x91 && packetID != 0xA4 && packetID != 0xEF)
             {
                 WriteConsole("Encrypted client detected, disconnecting");
-                Dispose();
+                Disconnect();
                 return true;
             }
 
@@ -744,7 +744,7 @@ namespace Server.Network
             Console.WriteLine(ex);
         }
 
-        public virtual void Dispose()
+        public void Disconnect()
         {
             if (Connection == null || !_running)
             {
@@ -774,7 +774,7 @@ namespace Server.Network
             Disposed.Enqueue(this);
         }
 
-        private void Disconnect()
+        private void Dispose()
         {
             Connection = null;
 

Projects/Server/Network/Packets/IncomingAccountPackets.cs

@@ -140,7 +140,7 @@ namespace Server.Network
 
             if (info == null || a == null || cityIndex < 0 || cityIndex >= info.Length)
             {
-                state.Dispose();
+                state.Disconnect();
             }
             else
             {
@@ -197,7 +197,7 @@ namespace Server.Network
                 else
                 {
                     state.BlockAllPackets = false;
-                    state.Dispose();
+                    state.Disconnect();
                 }
             }
         }
@@ -256,7 +256,7 @@ namespace Server.Network
 
             if (a == null || charSlot < 0 || charSlot >= a.Length)
             {
-                state.Dispose();
+                state.Disconnect();
             }
             else
             {
@@ -277,11 +277,11 @@ namespace Server.Network
 
                 if (m == null)
                 {
-                    state.Dispose();
+                    state.Disconnect();
                     return;
                 }
 
-                m.NetState?.Dispose();
+                m.NetState?.Disconnect();
 
                 state.SendClientVersionRequest();
 
@@ -382,7 +382,7 @@ namespace Server.Network
         {
             if (state.SentFirstPacket)
             {
-                state.Dispose();
+                state.Disconnect();
                 return;
             }
 
@@ -397,7 +397,7 @@ namespace Server.Network
             )
             {
                 state.WriteConsole("Invalid client detected, disconnecting");
-                state.Dispose();
+                state.Disconnect();
                 return;
             }
 
@@ -424,7 +424,7 @@ namespace Server.Network
             }
             else
             {
-                state.Dispose();
+                state.Disconnect();
             }
         }
 
@@ -436,7 +436,7 @@ namespace Server.Network
 
             if (info == null || a == null || index < 0 || index >= info.Length)
             {
-                state.Dispose();
+                state.Disconnect();
             }
             else
             {
@@ -457,7 +457,7 @@ namespace Server.Network
             if (state._seed == 0)
             {
                 state.WriteConsole("Invalid client detected, disconnecting");
-                state.Dispose();
+                state.Disconnect();
                 return;
             }
 
@@ -473,7 +473,7 @@ namespace Server.Network
         {
             if (state.SentFirstPacket)
             {
-                state.Dispose();
+                state.Disconnect();
                 return;
             }
 
@@ -512,7 +512,7 @@ namespace Server.Network
         private static void AccountLogin_ReplyRej(this NetState state, ALRReason reason)
         {
             state.SendAccountLoginRejected(reason);
-            state.Dispose();
+            state.Disconnect();
         }
 
         private class LoginTimer : Timer

Projects/Server/Network/Packets/IncomingExtendedCommandPackets.cs

@@ -126,7 +126,7 @@ namespace Server.Network
                     );
                 }
 
-                state.Dispose();
+                state.Disconnect();
             }
             else
             {

Projects/Server/Network/Packets/IncomingPlayerPackets.cs

@@ -372,7 +372,7 @@ namespace Server.Network
                 if (!buttonExists)
                 {
                     state.WriteConsole("Invalid gump response, disconnecting...");
-                    state.Dispose();
+                    state.Disconnect();
                     return;
                 }
 
@@ -381,7 +381,7 @@ namespace Server.Network
                 if (switchCount < 0 || switchCount > gump.m_Switches)
                 {
                     state.WriteConsole("Invalid gump response, disconnecting...");
-                    state.Dispose();
+                    state.Disconnect();
                     return;
                 }
 
@@ -397,7 +397,7 @@ namespace Server.Network
                 if (textCount < 0 || textCount > gump.m_TextEntries)
                 {
                     state.WriteConsole("Invalid gump response, disconnecting...");
-                    state.Dispose();
+                    state.Disconnect();
                     return;
                 }
 
@@ -411,7 +411,7 @@ namespace Server.Network
                     if (textLength > 239)
                     {
                         state.WriteConsole("Invalid gump response, disconnecting...");
-                        state.Dispose();
+                        state.Disconnect();
                         return;
                     }
 
@@ -596,11 +596,11 @@ namespace Server.Network
                     "Sent ingame packet (0xD7x{0:X2}) before having been attached to a mobile",
                     packetId
                 );
-                state.Dispose();
+                state.Disconnect();
             }
             else if (ph.Ingame && state.Mobile.Deleted)
             {
-                state.Dispose();
+                state.Disconnect();
             }
             else
             {

Projects/UOContent.Tests/Tests/Engines/Chat/ChatPacketTests.cs

@@ -15,7 +15,7 @@ namespace UOContent.Tests
         {
             var expected = new ChatMessagePacket(lang, number, param1, param2).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendChatMessage(lang, number, param1, param2);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Engines/Help/TestHelpTopicPacket.cs

@@ -16,7 +16,7 @@ namespace UOContent.Tests
         {
             var expected = new DisplayHelpTopic(topic, display).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendDisplayHelpTopic(topic, display);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Engines/ML Quests/MLQuestPacketTests.cs

@@ -21,7 +21,7 @@ namespace Server.Engines.MLQuests
 
             var expected = new RaceChanger(female, race).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendRaceChanger(female, race);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -33,7 +33,7 @@ namespace Server.Engines.MLQuests
         {
             var expected = new CloseRaceChanger().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCloseRaceChanger();
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Engines/Party/PartyPacketTests.cs

@@ -16,7 +16,7 @@ namespace UOContent.Tests
 
             var expected = new PartyEmptyList(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPartyRemoveMember(m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -37,7 +37,7 @@ namespace UOContent.Tests
 
             var expected = new PartyRemoveMember(member.Serial, p).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPartyRemoveMember(member.Serial, p);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -58,7 +58,7 @@ namespace UOContent.Tests
 
             var expected = new PartyMemberList(p).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPartyMemberList(p);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -75,7 +75,7 @@ namespace UOContent.Tests
 
             var expected = new PartyTextMessage(toAll, serial, text).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPartyTextMessage(serial, text, toAll);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -89,7 +89,7 @@ namespace UOContent.Tests
 
             var expected = new PartyInvitation(m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendPartyInvitation(m);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Engines/Veteran Rewards/Character Statue Maker/CharacterStatuePacketTests.cs

@@ -17,7 +17,7 @@ namespace UOContent.Tests
             Serial serial = s;
             var expected = new UpdateStatueAnimation(serial, status, anim, frame).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendStatueAnimation(serial, status, anim, frame);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Items/Books/BookPacketTests.cs

@@ -21,7 +21,7 @@ namespace UOContent.Tests
 
             var expected = new BookHeader(m, book).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendBookCover(m, book);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -57,7 +57,7 @@ namespace UOContent.Tests
 
             var expected = new BookPageDetails(book).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendBookContent(book);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Items/Bulletin Boards/BulletinBoardPacketTests.cs

@@ -21,7 +21,7 @@ namespace UOContent.Tests
 
             var expected = new BBDisplayBoard(bb).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendBBDisplayBoard(bb);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -48,7 +48,7 @@ namespace UOContent.Tests
             var expected = (content ?
                 (Packet)new BBMessageContent(bb, msg) : new BBMessageHeader(bb, msg)).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendBBMessage(bb, msg, content);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Items/Games/Mahjong/MahjongPacketTests.cs

@@ -17,7 +17,7 @@ namespace UOContent.Tests
 
             var expected = new MahjongJoinGame(game).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMahjongJoinGame(game);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -37,7 +37,7 @@ namespace UOContent.Tests
 
             var expected = new MahjongPlayersInfo(game, m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMahjongPlayersInfo(game, m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -55,7 +55,7 @@ namespace UOContent.Tests
 
             var expected = new MahjongGeneralInfo(game).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMahjongGeneralInfo(game);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -75,7 +75,7 @@ namespace UOContent.Tests
 
             var expected = new MahjongTilesInfo(game, m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMahjongTilesInfo(game, m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -95,7 +95,7 @@ namespace UOContent.Tests
 
             var expected = new MahjongTileInfo(game.Tiles[0], m).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMahjongTileInfo(game.Tiles[0], m);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -109,7 +109,7 @@ namespace UOContent.Tests
 
             var expected = new MahjongRelieve(game).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMahjongRelieve(game);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Items/Maps/TestMapItemPackets.cs

@@ -18,7 +18,7 @@ namespace UOContent.Tests
         {
             var mapItem = new MapItem(Map.Trammel);
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = (ns.NewCharacterList ?
@@ -40,7 +40,7 @@ namespace UOContent.Tests
 
             var expected = new MapCommand(mapItem, command, number, x, y).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendMapCommand(mapItem, command, x, y, number > 0);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Items/Misc/Corpses/CorpsePacketTests.cs

@@ -24,7 +24,7 @@ namespace UOContent.Tests
 
             var expected = new CorpseEquip(m, c).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCorpseEquip(m, c);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -44,7 +44,7 @@ namespace UOContent.Tests
 
             var c = new Corpse(m, m.Items);
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = (ns.ContainerGridLines ? (Packet)new CorpseContent6017(m, c) : new CorpseContent(m, c)).Compile();

Projects/UOContent.Tests/Tests/Multis/Boats/BoatPacketTests.cs

@@ -52,7 +52,7 @@ namespace UOContent.Tests
 
             beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == boat))).Returns(true);
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ProtocolChanges.HighSeas;
             var expected = new MoveBoatHS(beholder.Object, boat, d, speed, list, xOffset, yOffset).Compile();
 
@@ -95,7 +95,7 @@ namespace UOContent.Tests
 
             beholder.Setup(m => m.CanSee(It.Is<IEntity>(e => e == boat))).Returns(true);
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ProtocolChanges.HighSeas;
 
             var expected = new DisplayBoatHS(beholder.Object, boat).Compile();

Projects/UOContent.Tests/Tests/Network/Packets/ArrowPacketTests.cs

@@ -11,7 +11,7 @@ namespace Server.Tests.Network
         {
             var expected = new CancelArrow().Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendCancelArrow(0, 0, Serial.Zero);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -26,7 +26,7 @@ namespace Server.Tests.Network
         {
             var expected = new SetArrow(x, y).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.SendSetArrow(x, y, Serial.Zero);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -43,7 +43,7 @@ namespace Server.Tests.Network
 
             var expected = new CancelArrowHS(x, y, serial).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ProtocolChanges.HighSeas;
             ns.SendCancelArrow(x, y, serial);
 
@@ -61,7 +61,7 @@ namespace Server.Tests.Network
 
             var expected = new SetArrowHS(x, y, serial).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = ProtocolChanges.HighSeas;
             ns.SendSetArrow(x, y, serial);
 

Projects/UOContent.Tests/Tests/Network/Packets/BuffIconPacketTests.cs

@@ -19,7 +19,7 @@ namespace UOContent.Tests
                 mob, iconID, titleCliloc, secondaryCliloc, args, timeSpan
             ).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             BuffInfo.SendAddBuffPacket(ns, mob, iconID, titleCliloc, secondaryCliloc, args, timeSpan);
 
             var result = ns.SendPipe.Reader.TryRead();
@@ -33,7 +33,7 @@ namespace UOContent.Tests
             var buffIcon = BuffIcon.Disguised;
             var expected = new RemoveBuffPacket(m, buffIcon).Compile();
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             BuffInfo.SendRemoveBuffPacket(ns, m, buffIcon);
 
             var result = ns.SendPipe.Reader.TryRead();

Projects/UOContent.Tests/Tests/Skills/Tracking/TrackingGumpTests.cs

@@ -20,7 +20,7 @@ namespace UOContent.Tests
             pm.Skills.Tracking.BaseFixedPoint = 1000;
             var g = new TrackWhatGump(pm);
 
-            using var ns = PacketTestUtilities.CreateTestNetState();
+            var ns = PacketTestUtilities.CreateTestNetState();
             ns.ProtocolChanges = changes;
 
             var expected = g.Compile(ns).Compile();

Projects/UOContent/Accounting/AccountHandler.cs

@@ -216,7 +216,7 @@ namespace Server.Misc
         {
             if (!(state.Account is Account acct))
             {
-                state.Dispose();
+                state.Disconnect();
                 return;
             }
 

Projects/UOContent/Commands/Generic/Commands/Commands.cs

@@ -1250,7 +1250,7 @@ namespace Server.Commands.Generic
 
                         AddResponse($"They have been {(m_Ban ? "banned" : "kicked")}.");
 
-                        targState.Dispose();
+                        targState.Disconnect();
 
                         if (m_Ban)
                         {

Projects/UOContent/Gumps/AdminGump.cs

@@ -2365,7 +2365,7 @@ namespace Server.Gumps
 
                                             if (!hasAccess)
                                             {
-                                                ns.Dispose();
+                                                ns.Disconnect();
                                                 ++count;
                                             }
                                         }
@@ -3736,7 +3736,7 @@ namespace Server.Gumps
                                             "kicking",
                                             CommandLogging.Format(m)
                                         );
-                                        ns.Dispose();
+                                        ns.Disconnect();
                                         notice = "They have been kicked.";
                                     }
                                     else
@@ -3762,7 +3762,7 @@ namespace Server.Gumps
 
                                         var ns = m.NetState;
 
-                                        ns?.Dispose();
+                                        ns?.Disconnect();
 
                                         notice = "They have been banned.";
                                     }

Projects/UOContent/Gumps/ClientGump.cs

@@ -272,7 +272,7 @@ namespace Server.Gumps
                         {
                             focus.Say("I've been kicked!");
 
-                            m_State.Dispose();
+                            m_State.Disconnect();
 
                             CommandLogging.WriteLine(
                                 from,

Projects/UOContent/Items/Skill Items/Camping/Bedroll.cs

@@ -121,7 +121,7 @@ namespace Server.Items
                     pm.PlaceInBackpack(m_Bedroll);
 
                     pm.BedrollLogout = true;
-                    sender.Dispose();
+                    sender.Disconnect();
                 }
 
                 Campfire.RemoveEntry(m_Entry);

Projects/UOContent/Misc/ClientVerification.cs

@@ -172,7 +172,7 @@ namespace Server.Misc
             if (ns.Connection != null)
             {
                 ns.WriteConsole("Disconnecting, bad version");
-                ns.Dispose();
+                ns.Disconnect();
             }
         }
 

Projects/UOContent/Misc/ProfanityProtection.cs

@@ -99,7 +99,7 @@ namespace Server.Misc
                     return true;
                 case ProfanityAction.Disconnect:
                     {
-                        from.NetState?.Dispose();
+                        from.NetState?.Disconnect();
 
                         return false;
                     }

Projects/UOContent/Mobiles/PlayerMobile.cs

@@ -1287,7 +1287,7 @@ namespace Server.Mobiles
 
                     if (from.NetState != null)
                     {
-                        Timer.DelayCall(TimeSpan.FromSeconds(1.0), from.NetState.Dispose);
+                        Timer.DelayCall(TimeSpan.FromSeconds(1.0), from.NetState.Disconnect);
                     }
                 }
                 else if (from.AccessLevel >= AccessLevel.Administrator)

Projects/UOContent/Network/ProtocolExtensions.cs

@@ -39,11 +39,11 @@ namespace Server.Network
             if (ph.Ingame && state.Mobile == null)
             {
                 state.WriteConsole("Sent in-game packet (0xBFx{0:X2}) before having been attached to a mobile", packetID);
-                state.Dispose();
+                state.Disconnect();
             }
             else if (ph.Ingame && state.Mobile.Deleted)
             {
-                state.Dispose();
+                state.Disconnect();
             }
             else
             {