From cf61b50d9878485b5b3aca91627abf9ed1ad4601 Mon Sep 17 00:00:00 2001 From: William Burns Date: Sat, 25 Jul 2015 17:35:43 +0100 Subject: [PATCH] More changes. --- .../src/mineplex/core/achievement/AchievementCategory.java | 6 +++++- .../game/arcade/gui/privateServer/page/GameVotingPage.java | 2 ++ .../src/nautilus/game/arcade/managers/GameHostManager.java | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java index 676d45c0c..df3410ee2 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/achievement/AchievementCategory.java @@ -118,7 +118,11 @@ public enum AchievementCategory MICRO_BATTLE("Micro Battle", null, new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, - Material.LAVA, 0, GameCategory.ARCADE, null); + Material.LAVA, 0, GameCategory.ARCADE, null), + + BOMB_LOBBERS("Bomb Lobbers", null, + new StatDisplay[] { StatDisplay.WINS, StatDisplay.GAMES_PLAYED, StatDisplay.KILLS, StatDisplay.DEATHS, StatDisplay.GEMS_EARNED }, + Material.FIREBALL, 0, GameCategory.ARCADE, "Waller Kit"); private String _name; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java index 0de679829..fa645a7e4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/GameVotingPage.java @@ -3,6 +3,7 @@ package nautilus.game.arcade.gui.privateServer.page; import java.util.ArrayList; import org.bukkit.Material; +import org.bukkit.Sound; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -113,6 +114,7 @@ public class GameVotingPage extends BasePage for (Player p : UtilServer.getPlayers()) { UtilPlayer.message(p, F.main("Vote", "A vote has started! Use " + F.skill("/vote") + " to vote.")); + p.playSound(p.getLocation(), Sound.NOTE_BASS, 1F, 1F); } refresh(); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index f9f0ea08a..77deb6fa7 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -374,6 +374,13 @@ public class GameHostManager implements Listener return; } + if (!_voteInProgress) + { + UtilPlayer.message(event.getPlayer(), F.main("Vote", "There is no vote in progress.")); + event.setCancelled(true); + return; + } + event.setCancelled(true); _shop.openPageForPlayer(event.getPlayer(), new GameVotingPage(Manager, _shop, event.getPlayer())); return;