themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix incorrect slot calculation, and update submodule.

Browse source
This commit is contained in:
MarioE 2017-06-23 14:44:17 -04:00
parent 9ad63c37a6
commit 241d4c566f
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/TShock.cs
View file

@ -2237,9 +2237,9 @@ namespace TShockAPI
Netplay.ListenPort = file.ServerPort; Netplay.ListenPort = file.ServerPort;
} }
if (file.MaxSlots > 235) if (file.MaxSlots > Main.maxPlayers - file.ReservedSlots)
file.MaxSlots = 235; file.MaxSlots = Main.maxPlayers - file.ReservedSlots;
Main.maxNetPlayers = file.MaxSlots + 20; Main.maxNetPlayers = file.MaxSlots + file.ReservedSlots;
Netplay.ServerPassword = ""; Netplay.ServerPassword = "";
if (!string.IsNullOrEmpty(_cliPassword)) if (!string.IsNullOrEmpty(_cliPassword))

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit d3b7d9f4575602f468cf1e009ebc4bc5b79547c4 Subproject commit bc9f7c69becb60816fc1e4587bbca15991231317