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

binary wouldn't auto merge

Browse source 
Merge remote branch 'origin' into general-devel

Conflicts:
	TerrariaServerBins/TerrariaServer.exe
This commit is contained in:
k0rd 2013-10-02 21:05:37 -04:00
commit e961bdd71c
7 changed files with 196 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

28
TShockAPI/GetDataHandlers.cs
View file

@ -1774,6 +1774,30 @@ namespace TShockAPI
tile.type = 1;
changed = true;
}
// Purify crimson grass
else if (tile.type == 199 && newtile.Type == 2)
{
tile.type = 2;
changed = true;
}
// Purify crimstone
else if (tile.type == 203 && newtile.Type == 1)
{
tile.type = 1;
changed = true;
}
// Purify crimson grass vine -- might not be needed
else if (tile.type == 205 && newtile.Type == 52)
{
tile.type = 53;
changed = true;
}
// Purify crimsand
else if (tile.type == 234 && newtile.Type == 53)
{
tile.type = 53;
changed = true;
}
}
}
@ -1901,9 +1925,9 @@ namespace TShockAPI
return true;
}
byte[] rightClickKill = new byte[] { 4, 13, 33, 49, 50, 128};
byte[] breakableTiles = new byte[] { 4, 13, 33, 49, 50, 127, 128, 163};
Item selectedItem = args.TPlayer.inventory[args.TPlayer.selectedItem];
if (type == 0 && Main.tile[tileX, tileY].type != 127 && !Main.tileCut[Main.tile[tileX, tileY].type] && !rightClickKill.Contains(Main.tile[tileX, tileY].type))
if (type == 0 && !Main.tileCut[Main.tile[tileX, tileY].type] && !breakableTiles.Contains(Main.tile[tileX, tileY].type))
{
// If the tile is an axe tile and they aren't selecting an axe, they're hacking.
if (Main.tileAxe[Main.tile[tileX, tileY].type] && (selectedItem.axe == 0 && selectedItem.explosive == 0 && args.Player.RecentFuse == 0))