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

region define/delete handles names with spaces not wrapped in quotes (protect requires quotes around the name since region name is not the last argument).

Browse source
This commit is contained in:
ricky 2011-06-22 15:09:20 +10:00
parent 6b1310ba4c
commit 2f6c6bd1a4
1 changed files with 91 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

36
TShockAPI/Commands.cs
View file

@ -1029,13 +1029,16 @@ namespace TShockAPI
private static void Region(CommandArgs args) private static void Region(CommandArgs args)
{ {
string cmd = "help";
if (args.Parameters.Count > 0) if (args.Parameters.Count > 0)
{ {
switch (args.Parameters[0].ToLower()) cmd = args.Parameters[0].ToLower();
}
switch (cmd)
{ {
case "set": case "set":
{ {
if (args.Parameters.Count > 1) if (args.Parameters.Count == 2)
{ {
if (args.Parameters[1] == "1") if (args.Parameters[1] == "1")
{ {
@ -1064,6 +1067,8 @@ namespace TShockAPI
args.Player.SendMessage("You have not set Point 1 yet", Color.Red); args.Player.SendMessage("You have not set Point 1 yet", Color.Red);
} }
} }
else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region set [1/2]", Color.Red);
} }
else else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region set [1/2]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /region set [1/2]", Color.Red);
@ -1075,15 +1080,18 @@ namespace TShockAPI
{ {
if (!args.Player.TempArea.IsEmpty) if (!args.Player.TempArea.IsEmpty)
{ {
if (RegionManager.AddRegion(args.Player.TempArea.X, args.Player.TempArea.Y, args.Player.TempArea.Width, args.Player.TempArea.Height, args.Parameters[1], Main.worldName)) string regionName = String.Join(" ", args.Parameters.GetRange(1, args.Parameters.Count - 1));
if (RegionManager.AddRegion(args.Player.TempArea.X, args.Player.TempArea.Y,
args.Player.TempArea.Width, args.Player.TempArea.Height,
regionName, Main.worldName))
{ {
RegionManager.WriteSettings(); RegionManager.WriteSettings();
args.Player.TempArea = Rectangle.Empty; args.Player.TempArea = Rectangle.Empty;
args.Player.SendMessage("Set region " + args.Parameters[1], Color.Yellow); args.Player.SendMessage("Set region " + regionName, Color.Yellow);
} }
else else
{ {
args.Player.SendMessage("Region " + args.Parameters[1] + " already exists", Color.Red); args.Player.SendMessage("Region " + regionName + " already exists", Color.Red);
} }
} }
else else
@ -1095,19 +1103,20 @@ namespace TShockAPI
} }
case "protect": case "protect":
{ {
if (args.Parameters.Count > 2) if (args.Parameters.Count == 3)
{ {
string regionName = args.Parameters[1];
if (args.Parameters[2].ToLower() == "true") if (args.Parameters[2].ToLower() == "true")
{ {
if(RegionManager.SetRegionState(args.Parameters[1],true)) if (RegionManager.SetRegionState(regionName, true))
args.Player.SendMessage("Protected region " + args.Parameters[1], Color.Yellow); args.Player.SendMessage("Protected region " + regionName, Color.Yellow);
else else
args.Player.SendMessage("Could not find specified region", Color.Red); args.Player.SendMessage("Could not find specified region", Color.Red);
} }
else if (args.Parameters[2].ToLower() == "false") else if (args.Parameters[2].ToLower() == "false")
{ {
if (RegionManager.SetRegionState(args.Parameters[1], false)) if (RegionManager.SetRegionState(regionName, false))
args.Player.SendMessage("Unprotected region " + args.Parameters[1], Color.Yellow); args.Player.SendMessage("Unprotected region " + regionName, Color.Yellow);
else else
args.Player.SendMessage("Could not find specified region", Color.Red); args.Player.SendMessage("Could not find specified region", Color.Red);
} }
@ -1122,8 +1131,9 @@ namespace TShockAPI
{ {
if (args.Parameters.Count > 1) if (args.Parameters.Count > 1)
{ {
if (RegionManager.DeleteRegion(args.Parameters[1])) string regionName = String.Join(" ", args.Parameters.GetRange(1, args.Parameters.Count - 1));
args.Player.SendMessage("Deleted region " + args.Parameters[1], Color.Yellow); if (RegionManager.DeleteRegion(regionName))
args.Player.SendMessage("Deleted region " + regionName, Color.Yellow);
else else
args.Player.SendMessage("Could not find specified region", Color.Red); args.Player.SendMessage("Could not find specified region", Color.Red);
} }
@ -1138,6 +1148,7 @@ namespace TShockAPI
break; break;
} }
case "help": case "help":
default:
{ {
args.Player.SendMessage("Avialable region commands:", Color.Green); args.Player.SendMessage("Avialable region commands:", Color.Green);
args.Player.SendMessage("/region set [1/2] /region define [name] /region protect [name] [true/false]", Color.Yellow); args.Player.SendMessage("/region set [1/2] /region define [name] /region protect [name] [true/false]", Color.Yellow);
@ -1145,7 +1156,6 @@ namespace TShockAPI
break; break;
} }
} }
}
} }