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

Update /invade, make /help <command> not work if no access

Browse source
This commit is contained in:
MarioE 2013-10-05 10:59:37 -04:00
parent aa28b84d8c
commit 017b3f07f6
2 changed files with 36 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

39
TShockAPI/Commands.cs
View file

@ -567,7 +567,7 @@ namespace TShockAPI
if (!cmd.CanRun(player)) if (!cmd.CanRun(player))
{ {
TShock.Utils.SendLogs(string.Format("{0} tried to execute /{1}.", player.Name, cmdText), Color.PaleVioletRed, player); TShock.Utils.SendLogs(string.Format("{0} tried to execute /{1}.", player.Name, cmdText), Color.PaleVioletRed, player);
player.SendErrorMessage("You do not have access to that command."); player.SendErrorMessage("You do not have access to this command.");
} }
else if (!cmd.AllowServer && !player.RealPlayer) else if (!cmd.AllowServer && !player.RealPlayer)
{ {
@ -1651,12 +1651,36 @@ namespace TShockAPI
{ {
if (Main.invasionSize <= 0) if (Main.invasionSize <= 0)
{ {
TSPlayer.All.SendInfoMessage(string.Format("{0} has started a goblin army invasion.", args.Player.Name)); if (args.Parameters.Count != 1)
TShock.StartInvasion(); {
args.Player.SendErrorMessage("Invalid syntax! Proper syntax: /invade <invasion type>");
return;
}
switch (args.Parameters[0].ToLower())
{
case "goblin":
case "goblins":
case "goblin army":
TSPlayer.All.SendInfoMessage("{0} has started a goblin army invasion.", args.Player.Name);
TShock.StartInvasion(1);
break;
case "snowman":
case "snowmen":
case "snow legion":
TSPlayer.All.SendInfoMessage("{0} has started a snow legion invasion.", args.Player.Name);
TShock.StartInvasion(2);
break;
case "pirate":
case "pirates":
TSPlayer.All.SendInfoMessage("{0} has started a pirate invasion.", args.Player.Name);
TShock.StartInvasion(3);
break;
}
} }
else else
{ {
TSPlayer.All.SendInfoMessage(string.Format("{0} has ended a goblin army invasion.", args.Player.Name)); TSPlayer.All.SendInfoMessage("{0} has ended the invasion.", args.Player.Name);
Main.invasionSize = 0; Main.invasionSize = 0;
} }
} }
@ -3412,6 +3436,11 @@ namespace TShockAPI
args.Player.SendErrorMessage("Invalid command."); args.Player.SendErrorMessage("Invalid command.");
return; return;
} }
if (!command.CanRun(args.Player))
{
args.Player.SendErrorMessage("You do not have access to this command.");
return;
}
args.Player.SendSuccessMessage("/{0} help: ", args.Parameters[0].ToLower()); args.Player.SendSuccessMessage("/{0} help: ", args.Parameters[0].ToLower());
args.Player.SendInfoMessage(command.HelpText); args.Player.SendInfoMessage(command.HelpText);
@ -3654,7 +3683,7 @@ namespace TShockAPI
{ {
var msg = string.Join(" ", args.Parameters); var msg = string.Join(" ", args.Parameters);
args.Player.LastWhisper.SendMessage(String.Format("(Whisper From) <{0}> {1}", args.Player.Name, msg), Color.MediumPurple); args.Player.LastWhisper.SendMessage(String.Format("(Whisper From) <{0}> {1}", args.Player.Name, msg), Color.MediumPurple);
args.Player.SendMessage(String.Format("(Whisper To) <{0}> {1}", args.Player.LastWhisper.Name, msg) Color.MediumPurple); args.Player.SendMessage(String.Format("(Whisper To) <{0}> {1}", args.Player.LastWhisper.Name, msg), Color.MediumPurple);
} }
else else
{ {

9
TShockAPI/TShock.cs
View file

@ -1121,11 +1121,6 @@ namespace TShockAPI
} }
} }
if (player.Group.HasPermission(Permissions.causeevents) && Config.InfiniteInvasion)
{
StartInvasion();
}
player.LastNetPosition = new Vector2(Main.spawnTileX*16f, Main.spawnTileY*16f); player.LastNetPosition = new Vector2(Main.spawnTileX*16f, Main.spawnTileY*16f);
if (Config.RememberLeavePos && (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero)) if (Config.RememberLeavePos && (RememberedPos.GetLeavePos(player.Name, player.IP) != Vector2.Zero))
@ -1327,9 +1322,9 @@ namespace TShockAPI
* Useful stuff: * Useful stuff:
* */ * */
public static void StartInvasion() public static void StartInvasion(int type)
{ {
Main.invasionType = 1; Main.invasionType = type;
if (Config.InfiniteInvasion) if (Config.InfiniteInvasion)
{ {
Main.invasionSize = 20000000; Main.invasionSize = 20000000;