From a721572d0a7dcf41ac2a6fa76a414053cd20a5bf Mon Sep 17 00:00:00 2001 From: Eriki Iverson Date: Sun, 15 Apr 2012 11:02:57 -0500 Subject: [PATCH 1/2] Added separate permission for /userinfo --- TShockAPI/Commands.cs | 2 +- TShockAPI/Permissions.cs | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 41e8a213..a4dcf38c 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -193,7 +193,7 @@ namespace TShockAPI ChatCommands.Add(new Command(Permissions.canchangepassword, PasswordUser, "password") {DoLog = false}); ChatCommands.Add(new Command(Permissions.canregister, RegisterUser, "register") {DoLog = false}); ChatCommands.Add(new Command(Permissions.rootonly, ManageUsers, "user") {DoLog = false}); - add(Permissions.rootonly, GrabUserUserInfo, "userinfo", "ui"); + add(Permissions.userinfo, GrabUserUserInfo, "userinfo", "ui"); add(Permissions.rootonly, AuthVerify, "auth-verify"); ChatCommands.Add(new Command(Permissions.canlogin, AttemptLogin, "login") {DoLog = false}); add(Permissions.cfg, Broadcast, "broadcast", "bc", "say"); diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs index beffceb0..28c64426 100644 --- a/TShockAPI/Permissions.cs +++ b/TShockAPI/Permissions.cs @@ -28,6 +28,8 @@ namespace TShockAPI { //Permissions with blank descriptions basically means its described by the commands it gives access to. + [Description("Allows player to get user info")] public static readonly string userinfo; + [Description("")] public static readonly string causeevents; [Description("Required to be able to build (modify tiles and liquid)")] public static readonly string canbuild; From 1ba63130a3c80e7295744760bbe68d78a4ed42c0 Mon Sep 17 00:00:00 2001 From: Eriki Iverson Date: Sun, 15 Apr 2012 12:31:55 -0500 Subject: [PATCH 2/2] Added reason for shutting down --- TShockAPI/Commands.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index a4dcf38c..2238a9d2 100755 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -1051,7 +1051,8 @@ namespace TShockAPI } } - TShock.Utils.StopServer(); + string reason = ((args.Parameters.Count > 0) ? "Server shutting down: " + String.Join(" ", args.Parameters) : "Server shutting down!"); + TShock.Utils.StopServer(true, reason); } //Added restart command private static void Restart(CommandArgs args) @@ -1073,7 +1074,8 @@ namespace TShockAPI } } - TShock.Utils.StopServer(); + string reason = ((args.Parameters.Count > 0) ? "Server shutting down: " + String.Join(" ", args.Parameters) : "Server shutting down!"); + TShock.Utils.StopServer(true, reason); System.Diagnostics.Process.Start(System.Reflection.Assembly.GetExecutingAssembly().GetName().CodeBase); Environment.Exit(0); } @@ -1081,7 +1083,8 @@ namespace TShockAPI private static void OffNoSave(CommandArgs args) { - TShock.Utils.StopServer(false); + string reason = ((args.Parameters.Count > 0) ? "Server shutting down: " + String.Join(" ", args.Parameters) : "Server shutting down!"); + TShock.Utils.StopServer(false, reason); } private static void CheckUpdates(CommandArgs args)