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

Merge remote branch 'origin' into general-devel

Browse source
This commit is contained in:
k0rd 2013-10-04 17:15:24 -04:00
commit 3df69f9765
2 changed files with 99 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

17
TShockAPI/GetDataHandlers.cs
View file

@ -3193,32 +3193,31 @@ namespace TShockAPI
if (OnPaintTile(x, y, t))
return true;
if (!args.Player.Group.HasPermission(Permissions.canpaint))
if (TShock.CheckTilePermission(args.Player, x, y, true))
{
args.Player.SendTileSquare(x, y);
args.Player.SendData(PacketTypes.PaintTile, "", x, y, 0);
return true;
}
return false;
}
private static bool HandlePaintWall(GetDataHandlerArgs args)
{
var x = args.Data.ReadInt32();
var y = args.Data.ReadInt32();
var t = args.Data.ReadInt8();
if (OnPaintTile(x, y, t))
return true;
if (!args.Player.Group.HasPermission(Permissions.canpaint))
if (TShock.CheckTilePermission(args.Player, x, y, true))
{
args.Player.SendTileSquare(x, y);
args.Player.SendData(PacketTypes.PaintWall, "", x, y, 0);
return true;
}
return false;
}
private static bool HandleTeleport(GetDataHandlerArgs args)
{
var flag = args.Data.ReadInt8();