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

This commit is contained in:
high 2011-06-08 06:45:09 -04:00
commit 8435a56d51
2 changed files with 15 additions and 5 deletions

View file

@ -113,6 +113,7 @@ namespace TShockAPI
commands.Add(new Command("me", "", ThirdPerson)); commands.Add(new Command("me", "", ThirdPerson));
commands.Add(new Command("p", "", PartyChat)); commands.Add(new Command("p", "", PartyChat));
commands.Add(new Command("butcher", "cheat", Butcher)); commands.Add(new Command("butcher", "cheat", Butcher));
commands.Add(new Command("checkupdates", "maintenance", CheckUpdates));
if (ConfigurationManager.distributationAgent != "terraria-online") if (ConfigurationManager.distributationAgent != "terraria-online")
{ {
commands.Add(new Command("kill", "kill", Kill)); commands.Add(new Command("kill", "kill", Kill));
@ -124,6 +125,11 @@ namespace TShockAPI
#region Command Methods #region Command Methods
public static void CheckUpdates(CommandArgs args)
{
UpdateManager.CheckUpdate();
}
public static void PartyChat(CommandArgs args) public static void PartyChat(CommandArgs args)
{ {
int playerTeam = Main.player[args.PlayerID].team; int playerTeam = Main.player[args.PlayerID].team;

View file

@ -68,13 +68,17 @@ namespace TShockAPI
long currentEpoch = (DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000; long currentEpoch = (DateTime.Now.ToUniversalTime().Ticks - 621355968000000000) / 10000000;
if (currentEpoch > UpdateManager.updateEpoch) if (currentEpoch > UpdateManager.updateEpoch)
{ {
if (ServerIsOutOfDate()) CheckUpdate();
{
EnableUpdateCommand();
NotifyAdministrators(globalChanges);
}
} }
} }
public static void CheckUpdate()
{
if (ServerIsOutOfDate())
{
EnableUpdateCommand();
NotifyAdministrators(globalChanges);
}
}
} }
} }