diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index 859c736..9f71b76 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands$1.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands$1.class index 07ebc6a..71545ca 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands$1.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands$1.class differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class index 915823f..ad66698 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class differ diff --git a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class index ac9cce3..636c73a 100644 Binary files a/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class differ diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java index a03b647..e2bdc14 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java @@ -46,18 +46,21 @@ public class Commands implements CommandExecutor { .getUniqueId()); // 2015.08.08. if (!p.CommentedOnReddit && !args[0].toLowerCase().equals("admin") - && !args[0].toLowerCase().equals("ignore")) { + && !args[0].toLowerCase().equals("ignore") + && !args[0].toLowerCase().equals("kittycannon")) { player.sendMessage("§cError: You need to write your username to the reddit thread at /r/TheButtonMinecraft§r"); return true; } if (!p.FlairRecognised && !args[0].toLowerCase().equals("admin") - && !args[0].toLowerCase().equals("ignore")) { + && !args[0].toLowerCase().equals("ignore") + && !args[0].toLowerCase().equals("kittycannon")) { player.sendMessage("Sorry, but your flair isn't recorded. Please ask a mod to set it for you."); return true; } if (!p.FlairDecided && !args[0].toLowerCase().equals("admin") - && !args[0].toLowerCase().equals("ignore")) { + && !args[0].toLowerCase().equals("ignore") + && !args[0].toLowerCase().equals("kittycannon")) { player.sendMessage("Please select between /u nonpresser and /u cantpress"); return true; } diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java index a84bf34..5c1523c 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java @@ -334,9 +334,14 @@ public class PlayerListener implements Listener { // 2015.07.16. MinigamePlayer mp = Minigames.plugin.pdata.getMinigamePlayer(e .getPlayer()); // System.out.println("B"); - if (!e.getPlayer().isOp() - && (!mp.isInMinigame() || mp.getMinigame().getName(false) - .equalsIgnoreCase(Commands.KittyCannonMinigame))) + + /* + * if (!e.getPlayer().isOp() && (!mp.isInMinigame() || + * mp.getMinigame().getName(false) + * .equalsIgnoreCase(Commands.KittyCannonMinigame))) return; + */ + if (!(mp.isInMinigame() && mp.getMinigame().getName(false) + .equalsIgnoreCase(Commands.KittyCannonMinigame))) return; // System.out.println("C"); ItemStack item = e.getItem().getItemStack();