Conflicts

This commit is contained in:
Shank 2011-06-01 20:57:22 -06:00
parent d48426adfd
commit 034aea500f

View file

@ -221,7 +221,6 @@ namespace TShockAPI
Main.bloodMoon = true;
Main.time = 0;
Main.dayTime = false;
//Main.UpdateT();
NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
NetMessage.syncPlayers();
handler.Handled = true;
@ -424,6 +423,10 @@ namespace TShockAPI
Tools.Broadcast("Killed " + killcount.ToString() + " NPCs.");
handler.Handled = true;
}
if (msg.Length > 10 && msg.Substring(0, 10) == "/maxspawns")
{
}
}
if (msg == "/help")
{