From bb35845a59185e8cfd8db69d7be11214361ad3d5 Mon Sep 17 00:00:00 2001
From: Pieter-Jan Briers <pieterjan.briers+git@gmail.com>
Date: Wed, 7 Oct 2020 18:03:50 +0200
Subject: [PATCH] Do not allow selecting non existent character slots.

This fixes #2176
---
 Content.Server/Preferences/ServerPreferencesManager.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Content.Server/Preferences/ServerPreferencesManager.cs b/Content.Server/Preferences/ServerPreferencesManager.cs
index e9428a99e0..f7b6f70786 100644
--- a/Content.Server/Preferences/ServerPreferencesManager.cs
+++ b/Content.Server/Preferences/ServerPreferencesManager.cs
@@ -66,6 +66,12 @@ namespace Content.Server.Preferences
 
             var curPrefs = prefsData.Prefs!;
 
+            if (!curPrefs.Characters.ContainsKey(index))
+            {
+                // Non-existent slot.
+                return;
+            }
+
             prefsData.Prefs = new PlayerPreferences(curPrefs.Characters, index);
 
             if (ShouldStorePrefs(message.MsgChannel.AuthType))