Conflicts
This commit is contained in:
parent
d48426adfd
commit
034aea500f
1 changed files with 4 additions and 1 deletions
|
|
@ -221,7 +221,6 @@ namespace TShockAPI
|
||||||
Main.bloodMoon = true;
|
Main.bloodMoon = true;
|
||||||
Main.time = 0;
|
Main.time = 0;
|
||||||
Main.dayTime = false;
|
Main.dayTime = false;
|
||||||
//Main.UpdateT();
|
|
||||||
NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
|
NetMessage.SendData(18, -1, -1, "", 0, 0, Main.sunModY, Main.moonModY);
|
||||||
NetMessage.syncPlayers();
|
NetMessage.syncPlayers();
|
||||||
handler.Handled = true;
|
handler.Handled = true;
|
||||||
|
|
@ -424,6 +423,10 @@ namespace TShockAPI
|
||||||
Tools.Broadcast("Killed " + killcount.ToString() + " NPCs.");
|
Tools.Broadcast("Killed " + killcount.ToString() + " NPCs.");
|
||||||
handler.Handled = true;
|
handler.Handled = true;
|
||||||
}
|
}
|
||||||
|
if (msg.Length > 10 && msg.Substring(0, 10) == "/maxspawns")
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (msg == "/help")
|
if (msg == "/help")
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue