Merge branch 'master' of ssh://184.154.0.242:7999/min/mineplex

This commit is contained in:
Mini-Chiss 2015-05-03 18:33:03 -05:00
commit 73132d96b9
2 changed files with 3 additions and 2 deletions

View File

@ -1255,6 +1255,7 @@ public class Build extends SoloGame
if (e.equals(event.getRightClicked()))
{
_mobShop.attemptShopOpen(player, buildData, e);
event.setCancelled(true);
return;
}
}

View File

@ -38,7 +38,7 @@ public class GroundPage extends ShopPageBase<ArcadeManager, OptionsShop>
public GroundPage(Build game, ArcadeManager plugin, OptionsShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
{
super(plugin, shop, clientManager, donationManager, "Change Ground", player);
super(plugin, shop, clientManager, donationManager, "Change Ground", player, 9 * 4);
_game = game;
buildPage();
}
@ -69,7 +69,7 @@ public class GroundPage extends ShopPageBase<ArcadeManager, OptionsShop>
index++;
}
addButton((9 * 5) + 4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
addButton((9 * 3) + 4, new ShopItem(Material.BED, C.cGray + " \u21FD Go Back", new String[]{}, 1, false), new IButton()
{
@Override
public void onClick(Player player, ClickType clickType)