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

11
TShockAPI/GetDataHandlers.cs
View file

@ -3193,12 +3193,11 @@ namespace TShockAPI
if (OnPaintTile(x, y, t)) if (OnPaintTile(x, y, t))
return true; 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 true;
} }
return false; return false;
} }
@ -3211,14 +3210,14 @@ namespace TShockAPI
if (OnPaintTile(x, y, t)) if (OnPaintTile(x, y, t))
return true; 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 true;
} }
return false; return false;
} }
private static bool HandleTeleport(GetDataHandlerArgs args) private static bool HandleTeleport(GetDataHandlerArgs args)
{ {
var flag = args.Data.ReadInt8(); var flag = args.Data.ReadInt8();

43
TShockAPI/TShock.cs
View file

@ -1422,7 +1422,6 @@ namespace TShockAPI
{ {
if (TShock.Config.AllowIce && actionType != GetDataHandlers.EditAction.PlaceTile) if (TShock.Config.AllowIce && actionType != GetDataHandlers.EditAction.PlaceTile)
{ {
foreach (Point p in player.IceTiles) foreach (Point p in player.IceTiles)
{ {
if (p.X == tileX && p.Y == tileY && (Main.tile[p.X, p.Y].type == 0 || Main.tile[p.X, p.Y].type == 127)) if (p.X == tileX && p.Y == tileY && (Main.tile[p.X, p.Y].type == 0 || Main.tile[p.X, p.Y].type == 127))
@ -1432,11 +1431,11 @@ namespace TShockAPI
} }
} }
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000){ if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000)
{
player.SendMessage("You do not have permission to build!", Color.Red); player.SendMessage("You do not have permission to build!", Color.Red);
player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
return true; return true;
} }
@ -1446,13 +1445,12 @@ namespace TShockAPI
return false; return false;
} }
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000){ if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000)
{
player.SendMessage("You do not have permission to build!", Color.Red); player.SendMessage("You do not have permission to build!", Color.Red);
player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
return true; return true;
} }
if (!player.Group.HasPermission(Permissions.editspawn) && !Regions.CanBuild(tileX, tileY, player) && if (!player.Group.HasPermission(Permissions.editspawn) && !Regions.CanBuild(tileX, tileY, player) &&
@ -1462,7 +1460,6 @@ namespace TShockAPI
{ {
player.SendMessage("This region is protected from changes.", Color.Red); player.SendMessage("This region is protected from changes.", Color.Red);
player.RPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.RPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
return true; return true;
} }
@ -1479,14 +1476,15 @@ namespace TShockAPI
return true; return true;
} }
} }
if (Config.SpawnProtection) if (Config.SpawnProtection)
{ {
if (!player.Group.HasPermission(Permissions.editspawn)) if (!player.Group.HasPermission(Permissions.editspawn))
{ {
var flag = CheckSpawn(tileX, tileY); if (CheckSpawn(tileX, tileY))
if (flag) {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 2000)
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 2000){
player.SendMessage("Spawn is protected from changes.", Color.Red); player.SendMessage("Spawn is protected from changes.", Color.Red);
player.SPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.SPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
@ -1497,12 +1495,13 @@ namespace TShockAPI
return false; return false;
} }
public static bool CheckTilePermission(TSPlayer player, int tileX, int tileY) public static bool CheckTilePermission(TSPlayer player, int tileX, int tileY, bool paint = false)
{ {
if (!player.Group.HasPermission(Permissions.canbuild)) if ((!paint && !player.Group.HasPermission(Permissions.canbuild)) ||
(paint && !player.Group.HasPermission(Permissions.canpaint)))
{
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000)
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000){
player.SendMessage("You do not have permission to build!", Color.Red); player.SendMessage("You do not have permission to build!", Color.Red);
player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
@ -1512,8 +1511,6 @@ namespace TShockAPI
if (!player.Group.HasPermission(Permissions.editspawn) && !Regions.CanBuild(tileX, tileY, player) && if (!player.Group.HasPermission(Permissions.editspawn) && !Regions.CanBuild(tileX, tileY, player) &&
Regions.InArea(tileX, tileY)) Regions.InArea(tileX, tileY))
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000) if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.RPm) > 2000)
{ {
player.SendMessage("This region is protected from changes.", Color.Red); player.SendMessage("This region is protected from changes.", Color.Red);
@ -1526,33 +1523,33 @@ namespace TShockAPI
{ {
if (!player.Group.HasPermission(Permissions.editspawn)) if (!player.Group.HasPermission(Permissions.editspawn))
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.WPm) > 2000){ if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.WPm) > 2000)
{
player.SendMessage("The world is protected from changes.", Color.Red); player.SendMessage("The world is protected from changes.", Color.Red);
player.WPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.WPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
return true; return true;
} }
} }
if (Config.SpawnProtection) if (Config.SpawnProtection)
{ {
if (!player.Group.HasPermission(Permissions.editspawn)) if (!player.Group.HasPermission(Permissions.editspawn))
{ {
var flag = CheckSpawn(tileX, tileY); if (CheckSpawn(tileX, tileY))
if (flag) {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 1000)
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.SPm) > 1000){
player.SendMessage("Spawn is protected from changes.", Color.Red); player.SendMessage("Spawn is protected from changes.", Color.Red);
player.SPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.SPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
return true; return true;
} }
} }
} }
return false; return false;
} }
public static bool CheckSpawn(int x, int y) public static bool CheckSpawn(int x, int y)
{ {
Vector2 tile = new Vector2(x, y); Vector2 tile = new Vector2(x, y);