From e044dfaf52fa9c107508c7fca2b83f42a3f731d5 Mon Sep 17 00:00:00 2001
From: White <monsieur_white@hotmail.com>
Date: Thu, 16 Jul 2015 13:58:03 +0930
Subject: [PATCH] Fixed #992 Updated submodule

---
 TShockAPI/GetDataHandlers.cs | 6 ++++--
 TShockAPI/TShock.cs          | 9 ++++++++-
 TerrariaServerAPI            | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/TShockAPI/GetDataHandlers.cs b/TShockAPI/GetDataHandlers.cs
index 7e251404..95a7bd15 100755
--- a/TShockAPI/GetDataHandlers.cs
+++ b/TShockAPI/GetDataHandlers.cs
@@ -3496,7 +3496,8 @@ namespace TShockAPI
 				args.Player.SelectedItem.type != ItemID.SpectrePaintRoller && 
 				args.Player.SelectedItem.type != ItemID.SpectrePaintScraper &&
 				args.Player.SelectedItem.type != ItemID.SpectrePaintbrush &&
-				!args.Player.Accessories.Any(i => i != null && i.stack > 0 && i.type == ItemID.PaintSprayer))
+				!args.Player.Accessories.Any(i => i != null && i.stack > 0 &&
+					(i.type == ItemID.PaintSprayer || i.type == ItemID.ArchitectGizmoPack)))
 			{
 				args.Player.SendData(PacketTypes.PaintTile, "", x, y, Main.tile[x, y].color());
 				return true;
@@ -3539,7 +3540,8 @@ namespace TShockAPI
 				args.Player.SelectedItem.type != ItemID.SpectrePaintRoller &&
 				args.Player.SelectedItem.type != ItemID.SpectrePaintScraper &&
 				args.Player.SelectedItem.type != ItemID.SpectrePaintbrush &&
-				!args.Player.Accessories.Any(i => i != null && i.stack > 0 && i.type == ItemID.PaintSprayer))
+				!args.Player.Accessories.Any(i => i != null && i.stack > 0 &&
+					(i.type == ItemID.PaintSprayer || i.type == ItemID.ArchitectGizmoPack)))
 			{
 				args.Player.SendData(PacketTypes.PaintWall, "", x, y, Main.tile[x, y].wallColor());
 				return true;
diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 762ddeef..ffc1d0d0 100755
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -1574,7 +1574,14 @@ namespace TShockAPI
 			{
 				if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000)
 				{
-					player.SendErrorMessage("You do not have permission to build!");
+					if (paint)
+					{
+						player.SendErrorMessage("You do not have permission to paint!");
+					}
+					else
+					{
+						player.SendErrorMessage("You do not have permission to build!");
+					}
 					player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
 				}
 				return true;
diff --git a/TerrariaServerAPI b/TerrariaServerAPI
index bade4cb2..b4e41231 160000
--- a/TerrariaServerAPI
+++ b/TerrariaServerAPI
@@ -1 +1 @@
-Subproject commit bade4cb223a3a920f9366957efd5d864f5f3bc4c
+Subproject commit b4e41231dc5bc0329c686f8c2a584853e1839d18