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

Fixed rejection check inside of HandlePaintTile to account for the

Browse source 
Paint Sprayer (or Architect Gizmo Pack) being inside your inventory,
rather than on an accessory slot.
This commit is contained in:
James Puleo 2021-12-07 02:41:17 -05:00
parent f3b1a84821
commit fe3a59f84a
No known key found for this signature in database
GPG key ID: 3E16C7EFA34FB15D
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
TShockAPI/GetDataHandlers.cs
View file

@ -3549,6 +3549,11 @@ namespace TShockAPI
return true;
}
bool hasPaintSprayerAbilities(Item item) =>
item != null
&& item.stack > 0
&& (item.type == ItemID.PaintSprayer || item.type == ItemID.ArchitectGizmoPack);
// Not selecting paintbrush or paint scraper or the spectre versions? Hacking.
if (args.Player.SelectedItem.type != ItemID.PaintRoller &&
args.Player.SelectedItem.type != ItemID.PaintScraper &&
@ -3556,8 +3561,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 || i.type == ItemID.ArchitectGizmoPack)))
!args.Player.Accessories.Any(hasPaintSprayerAbilities) &&
!args.Player.Inventory.Any(hasPaintSprayerAbilities))
{
TShock.Log.ConsoleDebug("GetDataHandlers / HandlePaintTile rejected select consistency {0}", args.Player.Name);
args.Player.SendData(PacketTypes.PaintTile, "", x, y, Main.tile[x, y].color());