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

Merge branch 'master' of github.com:TShock/TShock

Browse source 
Conflicts:
	TShockAPI/TShock.cs
This commit is contained in:
high 2011-06-05 19:11:39 -04:00
commit 18a3265ab3
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
TShockAPI/TShock.cs
View file

@ -454,13 +454,16 @@ namespace TShockAPI
{
if (Main.netMode != 2) { return; }
if (Tools.activePlayers() + 1 > ConfigurationManager.maxSlots)
string ip = Tools.GetPlayerIP(ply); ;
players[ply] = new TSPlayer(ply);
players[ply].group = Tools.GetGroupForIP(ip);
if (Tools.activePlayers() + 1 > ConfigurationManager.maxSlots && !players[ply].group.HasPermission("reservedslot"))
{
Tools.Kick(ply, "Server is full");
return;
}
string ip = Tools.GetRealIP(Netplay.serverSock[ply].tcpClient.Client.RemoteEndPoint.ToString());
var ban = Bans.GetBanByIp(ip);
if (ban != null)
{