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

Fixed #992

Browse source 
Updated submodule
This commit is contained in:
White 2015-07-16 13:58:03 +09:30
parent 985f890153
commit e044dfaf52
3 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
TShockAPI/GetDataHandlers.cs
View file

@ -3496,7 +3496,8 @@ namespace TShockAPI
args.Player.SelectedItem.type != ItemID.SpectrePaintRoller && args.Player.SelectedItem.type != ItemID.SpectrePaintRoller &&
args.Player.SelectedItem.type != ItemID.SpectrePaintScraper && args.Player.SelectedItem.type != ItemID.SpectrePaintScraper &&
args.Player.SelectedItem.type != ItemID.SpectrePaintbrush && 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()); args.Player.SendData(PacketTypes.PaintTile, "", x, y, Main.tile[x, y].color());
return true; return true;
@ -3539,7 +3540,8 @@ namespace TShockAPI
args.Player.SelectedItem.type != ItemID.SpectrePaintRoller && args.Player.SelectedItem.type != ItemID.SpectrePaintRoller &&
args.Player.SelectedItem.type != ItemID.SpectrePaintScraper && args.Player.SelectedItem.type != ItemID.SpectrePaintScraper &&
args.Player.SelectedItem.type != ItemID.SpectrePaintbrush && 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()); args.Player.SendData(PacketTypes.PaintWall, "", x, y, Main.tile[x, y].wallColor());
return true; return true;

7
TShockAPI/TShock.cs
View file

@ -1573,8 +1573,15 @@ namespace TShockAPI
(paint && !player.Group.HasPermission(Permissions.canpaint))) (paint && !player.Group.HasPermission(Permissions.canpaint)))
{ {
if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000) if (((DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond) - player.BPm) > 2000)
{
if (paint)
{
player.SendErrorMessage("You do not have permission to paint!");
}
else
{ {
player.SendErrorMessage("You do not have permission to build!"); player.SendErrorMessage("You do not have permission to build!");
}
player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond; player.BPm = DateTime.Now.Ticks / TimeSpan.TicksPerMillisecond;
} }
return true; return true;

2
TerrariaServerAPI

@ -1 +1 @@
Subproject commit bade4cb223a3a920f9366957efd5d864f5f3bc4c Subproject commit b4e41231dc5bc0329c686f8c2a584853e1839d18