diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs index 75f52089..e138648f 100644 --- a/TShockAPI/Commands.cs +++ b/TShockAPI/Commands.cs @@ -2332,19 +2332,19 @@ namespace TShockAPI args.Player.SendErrorMessage("You are not in a party!"); } - private static void Mute(CommandArgs args) - { - if (args.Parameters.Count < 1) - { - args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /mute [reason]"); - return; - } + private static void Mute(CommandArgs args) + { + if (args.Parameters.Count < 1) + { + args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /mute [reason]"); + return; + } - var players = TShock.Utils.FindPlayer(args.Parameters[0]); - if (players.Count == 0) - args.Player.SendErrorMessage("Invalid player!"); - else if (players.Count > 1) - args.Player.SendErrorMessage("More than one player matched!"); + var players = TShock.Utils.FindPlayer(args.Parameters[0]); + if (players.Count == 0) + args.Player.SendErrorMessage("Invalid player!"); + else if (players.Count > 1) + args.Player.SendErrorMessage("More than one player matched!"); else if (players[0].Group.HasPermission(Permissions.mute)) { args.Player.SendErrorMessage("You cannot mute this player."); @@ -2357,12 +2357,14 @@ namespace TShockAPI } else { - string reason = String.Join(" ", args.Parameters.ToArray(), 1, args.Parameters.Count - 1); + string reason = "misbehavior"; + if (args.Parameters.Count > 1) + reason = String.Join(" ", args.Parameters.ToArray(), 1, args.Parameters.Count - 1); var plr = players[0]; plr.mute = true; TSPlayer.All.SendInfoMessage(String.Format("{0} has been muted by {1} for {2}.", plr.Name, args.Player.Name, reason)); } - } + } private static void Motd(CommandArgs args) { diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index b252e0ed..24ce53af 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1908,7 +1908,8 @@ namespace TShockAPI } if (!args.Player.Group.HasPermission(Permissions.ignorenoclipdetection) && - TSCheckNoclip(pos, args.TPlayer.width, args.TPlayer.height) && !TShock.Config.IgnoreNoClip) + TSCheckNoclip(pos, args.TPlayer.width, args.TPlayer.height) && !TShock.Config.IgnoreNoClip + && !args.TPlayer.tongued) { int lastTileX = (int) (args.Player.LastNetPosition.X/16f); int lastTileY = (int) (args.Player.LastNetPosition.Y/16f);