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

Merge pull request #631 from simon311/general-devel

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

4
TShockAPI/Commands.cs
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) if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack; itemAmount = item.maxStack;
@ -4099,7 +4099,7 @@ namespace TShockAPI
else else
{ {
var plr = players[0]; 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) if (itemAmount == 0 || itemAmount > item.maxStack)
itemAmount = item.maxStack; itemAmount = item.maxStack;

2
TShockAPI/TShock.cs
View file

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