themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Er, add in a default mute reason... also disable noclip detection while tongued.

Browse source
This commit is contained in:
MarioE 2012-08-20 10:00:46 -04:00
parent 25752ff710
commit 8bbed92683
2 changed files with 18 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

30
TShockAPI/Commands.cs
View file

@ -2332,19 +2332,19 @@ namespace TShockAPI
args.Player.SendErrorMessage("You are not in a party!"); args.Player.SendErrorMessage("You are not in a party!");
} }
private static void Mute(CommandArgs args) private static void Mute(CommandArgs args)
{ {
if (args.Parameters.Count < 1) if (args.Parameters.Count < 1)
{ {
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /mute <player> [reason]"); args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /mute <player> [reason]");
return; return;
} }
var players = TShock.Utils.FindPlayer(args.Parameters[0]); var players = TShock.Utils.FindPlayer(args.Parameters[0]);
if (players.Count == 0) if (players.Count == 0)
args.Player.SendErrorMessage("Invalid player!"); args.Player.SendErrorMessage("Invalid player!");
else if (players.Count > 1) else if (players.Count > 1)
args.Player.SendErrorMessage("More than one player matched!"); args.Player.SendErrorMessage("More than one player matched!");
else if (players[0].Group.HasPermission(Permissions.mute)) else if (players[0].Group.HasPermission(Permissions.mute))
{ {
args.Player.SendErrorMessage("You cannot mute this player."); args.Player.SendErrorMessage("You cannot mute this player.");
@ -2357,12 +2357,14 @@ namespace TShockAPI
} }
else 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]; var plr = players[0];
plr.mute = true; plr.mute = true;
TSPlayer.All.SendInfoMessage(String.Format("{0} has been muted by {1} for {2}.", plr.Name, args.Player.Name, reason)); 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) private static void Motd(CommandArgs args)
{ {

3
TShockAPI/GetDataHandlers.cs
View file

@ -1908,7 +1908,8 @@ namespace TShockAPI
} }
if (!args.Player.Group.HasPermission(Permissions.ignorenoclipdetection) && 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 lastTileX = (int) (args.Player.LastNetPosition.X/16f);
int lastTileY = (int) (args.Player.LastNetPosition.Y/16f); int lastTileY = (int) (args.Player.LastNetPosition.Y/16f);