From 1fd60c6f9fd49b910f7f2d640ef9c16fa27070cc Mon Sep 17 00:00:00 2001
From: Kamron Batman <3953314+kamronbatman@users.noreply.github.com>
Date: Mon, 8 Feb 2021 11:57:00 -0800
Subject: [PATCH] fix(core): Fixes connecting with CUO/Orion (#489)

- [X] Fixes connecting with CUO/Orion.
- [X] Adds the ability to be strict with the protocol by passing STRICT_UO_PROTOCOL to the build process.
---
 Projects/Server/Network/NetState/NetState.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Projects/Server/Network/NetState/NetState.cs b/Projects/Server/Network/NetState/NetState.cs
index 62fc7a181..e3f360385 100644
--- a/Projects/Server/Network/NetState/NetState.cs
+++ b/Projects/Server/Network/NetState/NetState.cs
@@ -717,8 +717,13 @@ namespace Server.Network
 
                             case ProtocolState.LoginServer_ServerSelectAck:
                                 {
-                                    // The code should never arrive here unless a packet is sent after server select.
+#if STRICT_UO_PROTOCOL
                                     HandleError(packetId, packetLength);
+#else
+                                    // Reset the state because CUO/Orion do not reconnect
+                                    _parserState = ParserState.AwaitingNextPacket;
+                                    _protocolState = ProtocolState.AwaitingSeed;
+#endif
                                     return true;
                                 }