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

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

View file

@ -194,7 +194,10 @@ namespace TShockAPI
{
for (int player = 0; player < Main.maxPlayers; player++)
{
Tools.Kick(player, "server shutting down");
if (Main.player[player].active)
{
Tools.Kick(player, "Server shutting down!");
}
}
WorldGen.saveWorld();
Netplay.disconnect = true;