diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index bd8d9df9..88fa0676 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -167,7 +167,7 @@ namespace TShockAPI add(Permissions.manageregion, Region, "region"); add(Permissions.manageregion, DebugRegions, "debugreg"); add(null, Help, "help"); - add(Permissions.candisplayplaying, Playing, "playing", "online", "who"); + add(null, Playing, "playing", "online", "who", "version"); add(null, AuthToken, "auth"); add(Permissions.cantalkinthird, ThirdPerson, "me"); add(Permissions.canpartychat, PartyChat, "p"); @@ -1791,7 +1791,7 @@ namespace TShockAPI return; } string passwd = args.Parameters[0]; - Netplay.password = passwd; + TShock.Config.ServerPassword = passwd; args.Player.SendMessage(string.Format("Server password changed to: {0}", passwd)); } @@ -2413,6 +2413,7 @@ namespace TShockAPI private static void Playing(CommandArgs args) { args.Player.SendMessage(string.Format("Current players: {0}.", TShock.Utils.GetPlayers()), 255, 240, 20); + args.Player.SendMessage(string.Format("TShock: {0} ({1}): ({2}/{3})", TShock.VersionNum, TShock.VersionCodename, TShock.Utils.ActivePlayers(), TShock.Config.MaxSlots)); } private static void AuthToken(CommandArgs args) diff --git a/TShockAPI/DB/GroupManager.cs b/TShockAPI/DB/GroupManager.cs index a766707c..42ac4294 100644 --- a/TShockAPI/DB/GroupManager.cs +++ b/TShockAPI/DB/GroupManager.cs @@ -29,7 +29,7 @@ namespace TShockAPI.DB creator.EnsureExists(table); //Add default groups - AddGroup("guest", "canbuild,canregister,canlogin,canpartychat,cantalkinthird,candisplayplaying"); + AddGroup("guest", "canbuild,canregister,canlogin,canpartychat,cantalkinthird"); AddGroup("default", "guest", "warp,canchangepassword"); AddGroup("newadmin", "default", "kick,editspawn,reservedslot"); AddGroup("admin", "newadmin", "ban,unban,whitelist,causeevents,spawnboss,spawnmob,managewarp,time,tp,pvpfun,kill,logs,immunetokick,tphere"); diff --git a/TShockAPI/Permissions.cs b/TShockAPI/Permissions.cs index 8db1ac28..8ff95f71 100644 --- a/TShockAPI/Permissions.cs +++ b/TShockAPI/Permissions.cs @@ -172,9 +172,6 @@ namespace TShockAPI [Description("User can talk in third person")] public static readonly string cantalkinthird; - - [Description("User can see who plays on server")] - public static readonly string candisplayplaying; [Description("Bypass Server Side Inventory checks")] public static readonly string bypassinventorychecks; diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 51247319..956cd74f 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -716,7 +716,6 @@ namespace TShockAPI } } TSPlayer.Server.SendMessage(string.Format("{0} players connected.", count)); - e.Handled = true; } else if (text.StartsWith("say ")) { @@ -726,13 +725,12 @@ namespace TShockAPI { Main.autoSave = Config.AutoSave = !Config.AutoSave; Log.ConsoleInfo("AutoSave " + (Config.AutoSave ? "Enabled" : "Disabled")); - e.Handled = true; } - else if (text.StartsWith("/")) + else { - if (Commands.HandleCommand(TSPlayer.Server, text)) - e.Handled = true; + Commands.HandleCommand(TSPlayer.Server, text); } + e.Handled = true; } private void OnGetData(GetDataEventArgs e)