Merge remote-tracking branch 'origin/master'

This commit is contained in:
Shaun Bennett 2015-12-14 00:29:11 -05:00
commit 063c87c4fe

View File

@ -294,14 +294,14 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
public void activateGadget(Player player, Gadget gadget)
{
if (gadget instanceof ItemGadget)
{
if (getPlugin().getInventoryManager().Get(player).getItemCount(gadget.GetName()) <= 0)
{
purchaseGadget(player, gadget);
return;
}
}
// if (gadget instanceof ItemGadget)
// {
// if (getPlugin().getInventoryManager().Get(player).getItemCount(gadget.GetName()) <= 0)
// {
// purchaseGadget(player, gadget);
// return;
// }
// }
playAcceptSound(player);
gadget.Enable(player);
@ -311,10 +311,10 @@ public class GadgetPage extends ShopPageBase<CosmeticManager, CosmeticShop>
public void handleRightClick(Player player, Gadget gadget)
{
if (gadget instanceof ItemGadget)
{
purchaseGadget(player, gadget);
}
// if (gadget instanceof ItemGadget)
// {
// purchaseGadget(player, gadget);
// }
}
public void deactivateGadget(Player player, Gadget gadget)