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

Don't allow breaking right-clickable tiles, fix /item and /give logic

Browse source
This commit is contained in:
MarioE 2013-11-20 17:52:50 -05:00
parent e50386084c
commit fde99208f5
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
TShockAPI/Commands.cs
View file

@ -4202,7 +4202,7 @@ namespace TShockAPI
}
}
if (args.Player.InventorySlotAvailable || (item.name.Contains("Coin") && item.type != 905) || item.type == 58 || item.type == 184)
if (args.Player.InventorySlotAvailable || (item.type > 70 && item.type < 75) || item.ammo > 0 || item.type == 58 || item.type == 184)
{
if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack;
@ -4214,7 +4214,7 @@ namespace TShockAPI
}
else
{
args.Player.SendErrorMessage("The item is banned and the config prevents you from spawning banned items.");
args.Player.SendErrorMessage("You cannot spawn banned items.");
}
}
else
@ -4282,7 +4282,7 @@ namespace TShockAPI
else
{
var plr = players[0];
if (plr.InventorySlotAvailable || (item.name.Contains("Coin") && item.type != 905) || item.type == 58 || item.type == 184)
if (plr.InventorySlotAvailable || (item.type > 70 && item.type < 75) || item.ammo > 0 || item.type == 58 || item.type == 184)
{
if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack;
@ -4293,7 +4293,7 @@ namespace TShockAPI
}
else
{
args.Player.SendErrorMessage("The item is banned and the config prevents spawning banned items.");
args.Player.SendErrorMessage("You cannot spawn banned items.");
}
}

4
TShockAPI/GetDataHandlers.cs
View file

@ -1870,7 +1870,7 @@ namespace TShockAPI
Item selectedItem = args.Player.SelectedItem;
int lastKilledProj = args.Player.LastKilledProjectile;
if (action == EditAction.KillTile && !Main.tileCut[Main.tile[tileX, tileY].type] && !breakableTiles.Contains(Main.tile[tileX, tileY].type))
if (action == EditAction.KillTile && !Main.tileCut[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))
@ -1984,7 +1984,7 @@ namespace TShockAPI
}
}
if (TShock.Config.AllowCutTilesAndBreakables && (Main.tileCut[Main.tile[tileX, tileY].type] || breakableTiles.Contains(Main.tile[tileX, tileY].type)))
if (TShock.Config.AllowCutTilesAndBreakables && Main.tileCut[Main.tile[tileX, tileY].type])
{
return false;
}