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

Fix Holy/Unholy Water not working

Browse source
This commit is contained in:
Deathmax 2011-12-12 21:26:26 +08:00
parent cb653f6237
commit c349fe0320
1 changed files with 67 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

70
TShockAPI/GetDataHandlers.cs
View file

@ -234,8 +234,7 @@ namespace TShockAPI
{ {
for (int y = 0; y < size; y++) for (int y = 0; y < size; y++)
{ {
tiles[x, y] = new NetTile(args.Data); // Need to fix this. Tiles in SendTileSquare have a short at the end tiles[x, y] = new NetTile(args.Data);
// that says how many tiles right are the same.
} }
} }
@ -254,11 +253,11 @@ namespace TShockAPI
var tile = Main.tile[realx, realy]; var tile = Main.tile[realx, realy];
var newtile = tiles[x, y]; var newtile = tiles[x, y];
Debug.WriteLine(string.Format("SendTileSquare : {0}, {1}", tile.type, newtile.Type));
if ((tile.type == 128 && newtile.Type == 128) || (tile.type == 105 || newtile.Type == 105)) if ((tile.type == 128 && newtile.Type == 128) || (tile.type == 105 || newtile.Type == 105))
{ {
Console.WriteLine("SendTileSquareCalled on a 128 or 105."); Console.WriteLine("SendTileSquareCalled on a 128 or 105.");
changed = true; changed = true;
} }
if (tile.type == 0x17 && newtile.Type == 0x2) if (tile.type == 0x17 && newtile.Type == 0x2)
@ -278,6 +277,71 @@ namespace TShockAPI
tile.frameY = newtile.FrameY; tile.frameY = newtile.FrameY;
changed = true; changed = true;
} }
else if (tile.type == 1 && newtile.Type == 117)
{
tile.type = 117;
changed = true;
}
else if (tile.type == 1 && newtile.Type == 25)
{
tile.type = 25;
changed = true;
}
else if (tile.type == 117 && newtile.Type == 25)
{
tile.type = 25;
changed = true;
}
else if (tile.type == 25 && newtile.Type == 117)
{
tile.type = 117;
changed = true;
}
else if (tile.type == 2 && newtile.Type == 23)
{
tile.type = 23;
changed = true;
}
else if (tile.type == 2 && newtile.Type == 109)
{
tile.type = 109;
changed = true;
}
else if (tile.type == 23 && newtile.Type == 109)
{
tile.type = 109;
changed = true;
}
else if (tile.type == 109 && newtile.Type == 23)
{
tile.type = 23;
changed = true;
}
else if (tile.type == 23 && newtile.Type == 109)
{
tile.type = 109;
changed = true;
}
else if (tile.type == 53 && newtile.Type == 116)
{
tile.type = 116;
changed = true;
}
else if (tile.type == 53 && newtile.Type == 112)
{
tile.type = 112;
changed = true;
}
else if (tile.type == 112 && newtile.Type == 116)
{
tile.type = 116;
changed = true;
}
else if (tile.type == 116 && newtile.Type == 112)
{
tile.type = 112;
changed = true;
}
} }
} }