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

172
TShockAPI/Commands.cs
View file

@ -1029,122 +1029,132 @@ 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();
{ }
case "set": switch (cmd)
{
case "set":
{
if (args.Parameters.Count == 2)
{ {
if (args.Parameters.Count > 1) if (args.Parameters[1] == "1")
{ {
if (args.Parameters[1] == "1") args.Player.TempArea.X = args.Player.TileX;
args.Player.TempArea.Y = args.Player.TileY;
args.Player.SendMessage("Set Temp Point 1", Color.Yellow);
}
else if (args.Parameters[1] == "2")
{
if (args.Player.TempArea.X != 0)
{ {
args.Player.TempArea.X = args.Player.TileX; if (args.Player.TileX > args.Player.TempArea.X && args.Player.TileY > args.Player.TempArea.Y)
args.Player.TempArea.Y = args.Player.TileY;
args.Player.SendMessage("Set Temp Point 1", Color.Yellow);
}
else if (args.Parameters[1] == "2")
{
if (args.Player.TempArea.X != 0)
{ {
if (args.Player.TileX > args.Player.TempArea.X && args.Player.TileY > args.Player.TempArea.Y) args.Player.TempArea.Width = args.Player.TileX - args.Player.TempArea.X;
{ args.Player.TempArea.Height = (args.Player.TileY + 3) - args.Player.TempArea.Y;
args.Player.TempArea.Width = args.Player.TileX - args.Player.TempArea.X; args.Player.SendMessage("Set Temp Point 2", Color.Yellow);
args.Player.TempArea.Height = (args.Player.TileY + 3) - args.Player.TempArea.Y;
args.Player.SendMessage("Set Temp Point 2", Color.Yellow);
}
else
{
args.Player.SendMessage("Point 2 must be below and right of Point 1", Color.Yellow);
args.Player.SendMessage("Use /region clear to start again", Color.Yellow);
}
} }
else else
{ {
args.Player.SendMessage("You have not set Point 1 yet", Color.Red); args.Player.SendMessage("Point 2 must be below and right of Point 1", Color.Yellow);
args.Player.SendMessage("Use /region clear to start again", Color.Yellow);
} }
} }
else
{
args.Player.SendMessage("You have not set Point 1 yet", 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);
break;
} }
case "define": else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region set [1/2]", Color.Red);
break;
}
case "define":
{
if (args.Parameters.Count > 1)
{ {
if (args.Parameters.Count > 1) if (!args.Player.TempArea.IsEmpty)
{ {
if (!args.Player.TempArea.IsEmpty) 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))
{ {
if (RegionManager.AddRegion(args.Player.TempArea.X, args.Player.TempArea.Y, args.Player.TempArea.Width, args.Player.TempArea.Height, args.Parameters[1], Main.worldName)) RegionManager.WriteSettings();
{ args.Player.TempArea = Rectangle.Empty;
RegionManager.WriteSettings(); args.Player.SendMessage("Set region " + regionName, Color.Yellow);
args.Player.TempArea = Rectangle.Empty;
args.Player.SendMessage("Set region " + args.Parameters[1], Color.Yellow);
}
else
{
args.Player.SendMessage("Region " + args.Parameters[1] + " already exists", Color.Red);
}
} }
else else
args.Player.SendMessage("Points not set up yet", Color.Red); {
args.Player.SendMessage("Region " + regionName + " already exists", Color.Red);
}
} }
else else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region define [name]", Color.Red); args.Player.SendMessage("Points not set up yet", Color.Red);
break;
} }
case "protect": else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region define [name]", Color.Red);
break;
}
case "protect":
{
if (args.Parameters.Count == 3)
{ {
if (args.Parameters.Count > 2) string regionName = args.Parameters[1];
if (args.Parameters[2].ToLower() == "true")
{ {
if (args.Parameters[2].ToLower() == "true") if (RegionManager.SetRegionState(regionName, true))
{ args.Player.SendMessage("Protected region " + regionName, Color.Yellow);
if(RegionManager.SetRegionState(args.Parameters[1],true))
args.Player.SendMessage("Protected region " + args.Parameters[1], Color.Yellow);
else
args.Player.SendMessage("Could not find specified region", Color.Red);
}
else if (args.Parameters[2].ToLower() == "false")
{
if (RegionManager.SetRegionState(args.Parameters[1], false))
args.Player.SendMessage("Unprotected region " + args.Parameters[1], Color.Yellow);
else
args.Player.SendMessage("Could not find specified region", Color.Red);
}
else else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region protected [name] [true/false]", Color.Red); args.Player.SendMessage("Could not find specified region", Color.Red);
} }
else else if (args.Parameters[2].ToLower() == "false")
args.Player.SendMessage("Invalid syntax! Proper syntax: /region protected [name] [true/false]", Color.Red);
break;
}
case "delete":
{
if (args.Parameters.Count > 1)
{ {
if (RegionManager.DeleteRegion(args.Parameters[1])) if (RegionManager.SetRegionState(regionName, false))
args.Player.SendMessage("Deleted 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);
} }
else else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region delete [name]", Color.Red); args.Player.SendMessage("Invalid syntax! Proper syntax: /region protected [name] [true/false]", Color.Red);
break;
} }
case "clear": else
args.Player.SendMessage("Invalid syntax! Proper syntax: /region protected [name] [true/false]", Color.Red);
break;
}
case "delete":
{
if (args.Parameters.Count > 1)
{ {
args.Player.TempArea = Rectangle.Empty; string regionName = String.Join(" ", args.Parameters.GetRange(1, args.Parameters.Count - 1));
args.Player.SendMessage("Cleared temp area", Color.Yellow); if (RegionManager.DeleteRegion(regionName))
break; args.Player.SendMessage("Deleted region " + regionName, Color.Yellow);
else
args.Player.SendMessage("Could not find specified region", Color.Red);
} }
case "help": else
{ args.Player.SendMessage("Invalid syntax! Proper syntax: /region delete [name]", Color.Red);
args.Player.SendMessage("Avialable region commands:", Color.Green); break;
args.Player.SendMessage("/region set [1/2] /region define [name] /region protect [name] [true/false]", Color.Yellow); }
args.Player.SendMessage("/region delete [name] /region clear (temporary region)", Color.Yellow); case "clear":
break; {
} args.Player.TempArea = Rectangle.Empty;
} args.Player.SendMessage("Cleared temp area", Color.Yellow);
break;
}
case "help":
default:
{
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 delete [name] /region clear (temporary region)", Color.Yellow);
break;
}
} }
} }