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

Merge branch 'general-devel' of github.com:TShock/TShock

Browse source 
Conflicts:
	TShockAPI/PacketBufferer.cs
	TShockAPI/Properties/AssemblyInfo.cs
This commit is contained in:
high 2011-08-09 18:42:31 -04:00
commit ceefbfdb03
21 changed files with 537 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

61
TShockAPI/GetDataHandlers.cs
View file

@ -256,6 +256,37 @@ namespace TShockAPI
int x = args.Data.ReadInt32();
int y = args.Data.ReadInt32();
byte tiletype = args.Data.ReadInt8();
if (args.Player.AwaitingTemp1)
{
args.Player.TempArea.X = x;
args.Player.TempArea.Y = y;
args.Player.SendMessage("Set Temp Point 1", Color.Yellow);
args.Player.SendTileSquare(x, y);
args.Player.AwaitingTemp1 = false;
return true;
}
if (args.Player.AwaitingTemp2)
{
if (x > args.Player.TempArea.X && y > args.Player.TempArea.Y)
{
args.Player.TempArea.Width = x - args.Player.TempArea.X;
args.Player.TempArea.Height = y - args.Player.TempArea.Y;
args.Player.SendMessage("Set Temp Point 2", Color.Yellow);
args.Player.SendTileSquare(x, y);
args.Player.AwaitingTemp2 = false;
}
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);
args.Player.SendTileSquare(x, y);
args.Player.AwaitingTemp2 = false;
}
return true;
}
if (!args.Player.Group.HasPermission("canbuild"))
{
if (!args.Player.HasBeenSpammedWithBuildMessage)
@ -547,6 +578,36 @@ namespace TShockAPI
if (tilex < 0 || tilex >= Main.maxTilesX || tiley < 0 || tiley >= Main.maxTilesY)
return false;
if (args.Player.AwaitingTemp1)
{
args.Player.TempArea.X = tilex;
args.Player.TempArea.Y = tiley;
args.Player.SendMessage("Set Temp Point 1", Color.Yellow);
args.Player.SendTileSquare(tilex, tiley);
args.Player.AwaitingTemp1 = false;
return true;
}
if (args.Player.AwaitingTemp2)
{
if (tilex > args.Player.TempArea.X && tiley > args.Player.TempArea.Y)
{
args.Player.TempArea.Width = tilex - args.Player.TempArea.X;
args.Player.TempArea.Height = tiley - args.Player.TempArea.Y;
args.Player.SendMessage("Set Temp Point 2", Color.Yellow);
args.Player.SendTileSquare(tilex, tiley);
args.Player.AwaitingTemp2 = false;
}
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);
args.Player.SendTileSquare(tilex, tiley);
args.Player.AwaitingTemp2 = false;
}
return true;
}
if (Main.tile[tilex, tiley].type != 0x15 && (!Tools.MaxChests() && Main.tile[tilex, tiley].type != 0)) //Chest
{
Log.Debug(string.Format("TileKill(TileXY:{0}_{1}, Type:{2})",