Prepare all incoming server packets for reading

jo3bingham · jo3bingham · commit 4aa7c8227b45 · 2018-09-15T13:31:59.000+01:00
diff --git a/TibiaAPI/Network/Connection.cs b/TibiaAPI/Network/Connection.cs
@@ -790,31 +790,22 @@ private void BeginReceiveServerCallback(IAsyncResult ar)
                     count += read;
                 }
 
-                var protocol = (int)ar.AsyncState;
-                if (protocol == 1)
-                {
-                    _serverInMessage.PrepareToParse(_xteaKey, _zStream);
-                    OnReceivedServerMessage?.Invoke(_serverInMessage.GetData());
+                _serverInMessage.PrepareToParse(_xteaKey, _zStream);
+                OnReceivedServerMessage?.Invoke(_serverInMessage.GetData());
 
-                    if (_isPacketParsingEnabled)
-                    {
-                        _serverOutMessage.Reset();
-                        _serverOutMessage.SequenceNumber = _serverInMessage.SequenceNumber;
+                if (_isPacketParsingEnabled)
+                {
+                    _serverOutMessage.Reset();
+                    _serverOutMessage.SequenceNumber = _serverInMessage.SequenceNumber;
 
-                        ParseServerMessage(_client, _serverInMessage, _serverOutMessage);
-                        // TODO: Until AppendToNetworkMessage() is complete for all server
-                        // packets, the original packet must be forwarded.
-                        SendToClient(_serverInMessage);
-                    }
-                    else
-                    {
-                        _serverInMessage.PrepareToSend(_xteaKey);
-                        SendToClient(_serverInMessage.GetData());
-                    }
+                    ParseServerMessage(_client, _serverInMessage, _serverOutMessage);
+                    // TODO: Until AppendToNetworkMessage() is complete for all server
+                    // packets, the original packet must be forwarded.
+                    SendToClient(_serverInMessage);
                 }
                 else
                 {
-                    OnReceivedServerMessage?.Invoke(_serverInMessage.GetData());
+                    _serverInMessage.PrepareToSend(_xteaKey);
                     SendToClient(_serverInMessage.GetData());
                 }
 
