diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ef4591b..1e26b913 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,9 @@ This is the rolling changelog for TShock for Terraria. Use past tense when adding new entries; sign your name off when you add or change something. This should primarily be things like user changes, not necessarily codebase changes unless it's really relevant or large. +## Upcoming changes +* Removed `/confuse` command and Terraria player data resync from @Zidonuke. (@hakusaro) + ## TShock 4.4.0 (Pre-release 3) * Fixed `/worldmode` command to correctly target world mode. (@Ristellise) * The following commands have been removed: `tbloodmoon`, `invade`, `dropmeteor`. `fullmoon`, `sandstorm`, `rain`, `eclipse` diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index ee84fc34..5d2c2912 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -337,10 +337,6 @@ namespace TShockAPI { HelpText = "Annoys a player for an amount of time." }); - add(new Command(Permissions.annoy, Confuse, "confuse") - { - HelpText = "Confuses a player for an amount of time." - }); add(new Command(Permissions.annoy, Rocket, "rocket") { HelpText = "Rockets a player upwards. Requires SSC." @@ -5208,26 +5204,6 @@ namespace TShockAPI } } - private static void Confuse(CommandArgs args) - { - if (args.Parameters.Count != 1) - { - args.Player.SendErrorMessage("Invalid syntax! Proper syntax: {0}confuse ", Specifier); - return; - } - var players = TSPlayer.FindByNameOrID(args.Parameters[0]); - if (players.Count == 0) - args.Player.SendErrorMessage("Invalid player!"); - else if (players.Count > 1) - args.Player.SendMultipleMatchError(players.Select(p => p.Name)); - else - { - var ply = players[0]; - ply.Confused = !ply.Confused; - args.Player.SendSuccessMessage("{0} is {1} confused.", ply.Name, ply.Confused ? "now" : "no longer"); - } - } - private static void Rocket(CommandArgs args) { if (args.Parameters.Count != 1)