Merge pull request #631 from simon311/general-devel

Fixing a few old "issues"
This commit is contained in:
k0rd 2013-10-07 01:46:59 -07:00
commit bc7ab4579d
2 changed files with 3 additions and 3 deletions

View file

@ -4019,7 +4019,7 @@ namespace TShockAPI
}
}
if (args.Player.InventorySlotAvailable || item.name.Contains("Coin"))
if (args.Player.InventorySlotAvailable || (item.name.Contains("Coin") && item.type != 905) || item.type == 58 || item.type == 184)
{
if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack;
@ -4099,7 +4099,7 @@ namespace TShockAPI
else
{
var plr = players[0];
if (plr.InventorySlotAvailable || item.name.Contains("Coin"))
if (plr.InventorySlotAvailable || (item.name.Contains("Coin") && item.type != 905) || item.type == 58 || item.type == 184)
{
if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack;

View file

@ -946,7 +946,7 @@ namespace TShockAPI
return;
}*/
if (args.Text.StartsWith("/"))
if (args.Text.StartsWith("/") & args.Text.Length > 1)
{
try
{