From 2bb172e087309b66680de5e269daea48c7724bf6 Mon Sep 17 00:00:00 2001
From: Maxwell Edwards <93385879+MaxEdwards20@users.noreply.github.com>
Date: Tue, 2 Apr 2024 11:28:16 -0600
Subject: [PATCH] Fixes crash (#27)

---
 src/Client/Menu/GamePlayView.cs           | 2 +-
 src/Server/MessageQueueServer.cs          | 3 ++-
 src/Server/Properties/launchSettings.json | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Client/Menu/GamePlayView.cs b/src/Client/Menu/GamePlayView.cs
index d5f706c..3f69175 100644
--- a/src/Client/Menu/GamePlayView.cs
+++ b/src/Client/Menu/GamePlayView.cs
@@ -96,7 +96,7 @@ public override void RegisterCommands()
 
         private bool connectToServer()
         {
-            return MessageQueueClient.instance.initialize("localhost", 4010);
+            return MessageQueueClient.instance.initialize("localhost", 4000);
         }
 
         private void escape(GameTime gameTime, float scale)
diff --git a/src/Server/MessageQueueServer.cs b/src/Server/MessageQueueServer.cs
index 80e5f63..f925478 100644
--- a/src/Server/MessageQueueServer.cs
+++ b/src/Server/MessageQueueServer.cs
@@ -102,7 +102,8 @@ public void sendMessage(int clientId, Message message, uint? messageId = null)
         /// </summary>
         public void sendMessageWithLastId(int clientId, Message message)
         {
-            sendMessage(clientId, message, m_clientLastMessageId[clientId]);
+            var lastId = m_clientLastMessageId.ContainsKey(clientId) ? m_clientLastMessageId[clientId] : 0;
+            sendMessage(clientId, message, lastId);
         }
 
         /// <summary>
diff --git a/src/Server/Properties/launchSettings.json b/src/Server/Properties/launchSettings.json
index bf82ad4..51359be 100644
--- a/src/Server/Properties/launchSettings.json
+++ b/src/Server/Properties/launchSettings.json
@@ -2,7 +2,7 @@
   "profiles": {
     "Server": {
       "commandName": "Project",
-      "commandLineArgs": "--port 4010"
+      "commandLineArgs": "--port 4000"
     }
   }
 }
\ No newline at end of file