From 11a85dc817a86e4ef619f806f273e1b3299249c0 Mon Sep 17 00:00:00 2001 From: Zack Piispanen Date: Wed, 30 May 2012 18:31:40 -0400 Subject: [PATCH] Format issues and tile place check for walls --- TShockAPI/GetDataHandlers.cs | 2 +- TShockAPI/TShock.cs | 16 +++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs index 800516a6..5b83a061 100644 --- a/TShockAPI/GetDataHandlers.cs +++ b/TShockAPI/GetDataHandlers.cs @@ -1750,7 +1750,7 @@ namespace TShockAPI return true; } - if (type == 1 && !args.Player.Group.HasPermission(Permissions.ignoreplacetiledetection)) + if ( ( type == 1 || type == 3 ) && !args.Player.Group.HasPermission(Permissions.ignoreplacetiledetection)) { args.Player.TilePlaceThreshold++; var coords = new Vector2(tileX, tileY); diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index 1ffd72f0..59f5f49d 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -1289,6 +1289,7 @@ namespace TShockAPI { if (TShock.Config.AllowIce && actionType != 1) { + 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)) @@ -1297,11 +1298,12 @@ namespace TShockAPI return false; } } - if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000){ - player.SendMessage("You do not have permission to build!", Color.Red); - player.BPm=DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; -} + if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000){ + player.SendMessage("You do not have permission to build!", Color.Red); + player.BPm=DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; + } + return true; } @@ -1311,11 +1313,11 @@ namespace TShockAPI 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.BPm=DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; + player.BPm=DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; + } -} return true; }