diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 2c593d8f..25860577 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -3798,7 +3798,8 @@ namespace TShockAPI private static void Reload(CommandArgs args) { - TShock.Utils.Reload(args.Player); + TShock.Utils.Reload(); + Hooks.GeneralHooks.OnReloadEvent(args.Player); args.Player.SendSuccessMessage( "Configuration, permissions, and regions reload complete. Some changes may require a server restart."); diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs index d47130b6..5174b560 100644 --- a/TShockAPI/Rest/RestManager.cs +++ b/TShockAPI/Rest/RestManager.cs @@ -339,7 +339,8 @@ namespace TShockAPI [Token] private object ServerReload(RestRequestArgs args) { - TShock.Utils.Reload(new TSRestPlayer(args.TokenData.Username, TShock.Groups.GetGroupByName(args.TokenData.UserGroupName))); + TShock.Utils.Reload(); + Hooks.GeneralHooks.OnReloadEvent(new TSRestPlayer(args.TokenData.Username, TShock.Groups.GetGroupByName(args.TokenData.UserGroupName))); return RestResponse("Configuration, permissions, and regions reload complete. Some changes may require a server restart."); } diff --git a/TShockAPI/Utils.cs b/TShockAPI/Utils.cs index 5e5e7580..2c95af15 100644 --- a/TShockAPI/Utils.cs +++ b/TShockAPI/Utils.cs @@ -495,7 +495,7 @@ namespace TShockAPI /// /// Reloads all configuration settings, groups, regions and raises the reload event. /// - public void Reload(TSPlayer player) + public void Reload() { FileTools.SetupConfig(); TShock.HandleCommandLinePostConfigLoad(Environment.GetCommandLineArgs()); @@ -504,7 +504,6 @@ namespace TShockAPI TShock.Itembans.UpdateItemBans(); TShock.ProjectileBans.UpdateBans(); TShock.TileBans.UpdateBans(); - Hooks.GeneralHooks.OnReloadEvent(player); } /// HasBanExpired - Returns whether or not a ban has expired or not.