Merge pull request #100 from Eastrall/refacto/optimizations

Remove useless code
heartofimpetus · May 19, 2018 · 6d6dc02 · 6d6dc02
2 parents a67caf8 + 9bd24ea
commit 6d6dc02
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 12 deletions.
diff --git a/src/Ether.Network/Client/NetClient.cs b/src/Ether.Network/Client/NetClient.cs
@@ -220,15 +220,10 @@ private void ProcessReceiveQueue()
 
                     if (buffer == null)
                         continue;
-
-                    byte[] packetData = this.PacketProcessor.IncludeHeader
-                        ? this.Token.HeaderData.Concat(buffer).ToArray()
-                        : buffer;
-                    this.Token.HeaderData = null;
-
+
                     Task.Run(() =>
                     {
-                        using (INetPacketStream packet = this.PacketProcessor.CreatePacket(packetData))
+                        using (INetPacketStream packet = this.PacketProcessor.CreatePacket(buffer))
                             this.HandleMessage(packet);
                     }, this._cancelToken);
                 }

diff --git a/src/Ether.Network/Server/NetServer.cs b/src/Ether.Network/Server/NetServer.cs
@@ -120,9 +120,6 @@ public void Stop()
         /// <inheritdoc />
         public void DisconnectClient(Guid clientId)
         {
-            if (!this._clients.ContainsKey(clientId))
-                return;
-
             if (!this._clients.TryRemove(clientId, out T removedClient))
                 return;
 
@@ -143,7 +140,7 @@ public void SendTo(IEnumerable<INetUser> users, INetPacketStream packet)
         public void SendToAll(INetPacketStream packet) => this.SendTo(this.Clients, packet);
 
         /// <inheritdoc />
-        public INetUser GetUser(Guid id) => this._clients.ContainsKey(id) ? this._clients[id] : null;
+        public INetUser GetUser(Guid id) => this._clients.TryGetValue(id, out T user) ? user : null;
 
         /// <summary>
         /// Initialize the server resourrces.
@@ -262,8 +259,9 @@ private void ProcessSendQueue()
                     if (message.User != null && message.Message != null)
                         this.SendMessage(message);
                 }
-                catch
+                catch (Exception e)
                 {
+                    this.OnError(e);
                     if (this._sendQueueCancelToken.IsCancellationRequested)
                         break;
                 }