diff --git a/Plugins/Mineplex.Game.Clans.Core/.classpath b/Plugins/Mineplex.Game.Clans.Core/.classpath index 58c850887..fa4ddd8ed 100644 --- a/Plugins/Mineplex.Game.Clans.Core/.classpath +++ b/Plugins/Mineplex.Game.Clans.Core/.classpath @@ -1,7 +1,7 @@ - + diff --git a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java index 307efe8fe..7f37c8114 100644 --- a/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java +++ b/Plugins/Mineplex.Game.Clans.Core/src/mineplex/game/clans/core/repository/ClanRepository.java @@ -135,7 +135,7 @@ public class ClanRepository extends RepositoryBase * @param clanId - the id of the clan to move * @param serverId - the id of the destination server being moved to */ - public void moveClanServer(int clanId, String serverName, Callback callback) + public void moveClanServer(final int clanId, String serverName, final Callback callback) { executeQuery(GET_CLAN_SERVER, new ResultSetCallable() { @@ -156,7 +156,7 @@ public class ClanRepository extends RepositoryBase executeUpdate(UPDATE_CLAN_SERVER_ID, serverIdCol, clanIdCol); } - callback.run(success); + callback.run(success); } }, new ColumnVarChar("serverName", 100, serverName)); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java b/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java index 961a5bfee..4b058b45f 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/HubType.java @@ -2,7 +2,7 @@ package mineplex.hub; public enum HubType { - Normal, + Normal, Halloween, Christmas } diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java index 743090912..72908145b 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClanMoveServerButton.java @@ -20,7 +20,7 @@ public class ClanMoveServerButton implements IButton { _repository = repository; _clan = clan; - _serverName = serverName; + _serverName = serverName; } @Override diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java index 3cca1edda..9987f36de 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/clans/ClansServerShop.java @@ -2,6 +2,9 @@ package mineplex.hub.server.ui.clans; import org.bukkit.Sound; import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.block.Action; +import org.bukkit.event.player.PlayerInteractEvent; import mineplex.core.account.CoreClientManager; import mineplex.core.common.util.C; @@ -22,7 +25,7 @@ public class ClansServerShop extends ShopBase public ClansServerShop(ServerManager plugin, CoreClientManager clientManager, DonationManager donationManager) { super(plugin, clientManager, donationManager, "Clans"); - + System.out.println("initiateddd-----------------------------------"); _repository = new ClanRepository(plugin.getPlugin(), plugin.getStatusManager().getCurrentServerName()); } @@ -56,4 +59,22 @@ public class ClansServerShop extends ShopBase { getPlugin().getHubManager().GetVisibility().removeHiddenPlayer(player); } + + // TODO: REMOVE THIS, JUST FOR DEBUGGING + @EventHandler + public void onPlayerInteract(PlayerInteractEvent event) + { + System.out.println("CALLED"); + if (event.getPlayer().getName().equalsIgnoreCase("Elinoo") + || event.getPlayer().getName().equalsIgnoreCase("MrTwiggy") + || event.getPlayer().getName().equalsIgnoreCase("GetGrimyWits")) + { + System.out.println("CALLED2"); + if (event.getPlayer().isSneaking() && event.getAction() == Action.RIGHT_CLICK_AIR) + { + System.out.println("CALLED3"); + this.attemptShopOpen(event.getPlayer()); + } + } + } }