From 034aea500fa74c7f7cc4762e14a24db8d88fd0c3 Mon Sep 17 00:00:00 2001
From: Shank <nicatron21@gmail.com>
Date: Wed, 1 Jun 2011 20:57:22 -0600
Subject: [PATCH] Conflicts

---
 TShockAPI/TShock.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index fa6f5a0b..e7cd308b 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -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")
             {