From 241d4c566faedd740796822ed1f5cdb10c377dfd Mon Sep 17 00:00:00 2001
From: MarioE <marioe27@hotmail.com>
Date: Fri, 23 Jun 2017 14:44:17 -0400
Subject: [PATCH] Fix incorrect slot calculation, and update submodule.

---
 TShockAPI/TShock.cs | 6 +++---
 TerrariaServerAPI   | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 776846fa..022e70e5 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -2237,9 +2237,9 @@ namespace TShockAPI
 				Netplay.ListenPort = file.ServerPort;
 			}
 
-			if (file.MaxSlots > 235)
-				file.MaxSlots = 235;
-			Main.maxNetPlayers = file.MaxSlots + 20;
+			if (file.MaxSlots > Main.maxPlayers - file.ReservedSlots)
+				file.MaxSlots = Main.maxPlayers - file.ReservedSlots;
+			Main.maxNetPlayers = file.MaxSlots + file.ReservedSlots;
 
 			Netplay.ServerPassword = "";
 			if (!string.IsNullOrEmpty(_cliPassword))
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index d3b7d9f4..bc9f7c69 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit d3b7d9f4575602f468cf1e009ebc4bc5b79547c4
+Subproject commit bc9f7c69becb60816fc1e4587bbca15991231317