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

Merge pull request #1216 from cracker64/general-devel

Browse source 
Properly follow tileData for region checks. Fix #1159
This commit is contained in:
Rodrigo 2016-06-15 23:07:28 +01:00 • committed by GitHub
commit edc3d34d68
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/GetDataHandlers.cs
View file

@ -2231,12 +2231,8 @@ namespace TShockAPI
if (tileData == null) if (tileData == null)
return true; return true;
if (tileData.Width == 3 && tileData.Height == 2) { x -= 1; y -= 1; } x -= tileData.Origin.X;
else if (tileData.Width == 4 && tileData.Height == 2) { x -= 1; y -= 1; } y -= tileData.Origin.Y;
else if (tileData.Width == 6 && tileData.Height == 3) { x -= 2; y -= 2; }
else if (tileData.Width == 6 && tileData.Height == 4) { x -= 2; y -= 3; }
else if (tileData.Width == 3 && tileData.Height == 3) { x -= 1; y -= 2; }
else if (tileData.Width == 3 && tileData.Height == 4) { x -= 1; y -= 3; }
for (int i = x; i < x + tileData.Width; i++) for (int i = x; i < x + tileData.Width; i++)
{ {