+ span

dust765 · Mar 21, 2023 · 50d129c · 50d129c
1 parent 06c190d
commit 50d129c
Show file tree

Hide file tree

Showing 10 changed files with 551 additions and 617 deletions.
diff --git a/src/ClassicUO.Client/Game/Managers/TargetManager.cs b/src/ClassicUO.Client/Game/Managers/TargetManager.cs
@@ -463,7 +463,7 @@ public static void TargetLast()
             _lastDataBuffer[5] = (byte) _targetCursorId;
             _lastDataBuffer[6] = (byte) TargetingType;
 
-            NetClient.Socket.Send(_lastDataBuffer, _lastDataBuffer.Length);
+            NetClient.Socket.Send(_lastDataBuffer);
             Mouse.CancelDoubleClick = true;
             ClearTargetingWithoutTargetCancelPacket();
         }

diff --git a/src/ClassicUO.Client/Game/Scenes/LoginScene.cs b/src/ClassicUO.Client/Game/Scenes/LoginScene.cs
@@ -683,12 +683,6 @@ public void HandleRelayServerPacket(ref StackDataReader p)
             NetClient.Socket = new NetClient();
             EncryptionHelper.Initialize(false, seed, (ENCRYPTION_TYPE) Settings.GlobalSettings.Encryption);
 
-            //void onConnected(object sender, EventArgs e)
-            //{
-
-            //}
-
-            //NetClient.Socket.Connected += onConnected;
             NetClient.Socket.Connect(new IPAddress(ip).ToString(), port);
 
             if (NetClient.Socket.IsConnected)
@@ -697,9 +691,7 @@ public void HandleRelayServerPacket(ref StackDataReader p)
                 unsafe
                 {
                     Span<byte> b = stackalloc byte[4] { (byte)(seed >> 24), (byte)(seed >> 16), (byte)(seed >> 8), (byte)seed };
-                    StackDataWriter writer = new StackDataWriter(b);
-                    NetClient.Socket.Send(writer.AllocatedBuffer, writer.BytesWritten, true, true);
-                    writer.Dispose();
+                    NetClient.Socket.Send(b, true, true);
                 }
 
                 NetClient.Socket.Send_SecondLogin(Account, Password, seed);

diff --git a/src/ClassicUO.Client/Game/UltimaLive.cs b/src/ClassicUO.Client/Game/UltimaLive.cs
@@ -78,8 +78,8 @@ public class UltimaLive
         public static void Enable()
         {
             Log.Trace("Setup packet for UltimaLive");
-            PacketHandlers.Handlers.Add(0x3F, OnUltimaLivePacket);
-            PacketHandlers.Handlers.Add(0x40, OnUpdateTerrainPacket);
+            PacketHandlers.Handler.Add(0x3F, OnUltimaLivePacket);
+            PacketHandlers.Handler.Add(0x40, OnUpdateTerrainPacket);
         }
 
         //The UltimaLive packets could be also used for other things than maps and statics

diff --git a/src/ClassicUO.Client/GameController.cs b/src/ClassicUO.Client/GameController.cs
@@ -403,9 +403,9 @@ protected override void Update(GameTime gameTime)
 
             Mouse.Update();
 
-            var handler = PacketHandlers.Handlers;
-            var span = NetClient.Socket.GetNetworkData();
-            handler.ParsePackets(span);
+            var data = NetClient.Socket.CollectAvailableData();
+            var packetsCount = PacketHandlers.Handler.ParsePackets(data);
+            NetClient.Socket.Statistics.TotalPacketsReceived += (uint) packetsCount;
             NetClient.Socket.Flush();
 
             Plugin.Tick();