ChromaGaming/Chroma-Chat
1
0
Fork 0
Code Issues 15 Pull requests 1 Packages Projects Releases 8 Wiki Activity

Fixed KittyCannon

Browse source
This commit is contained in:
Norbi Peti 2015-11-28 01:09:01 +01:00
parent 77bc93d674
commit 682af5c0a0
6 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
TheButtonAutoFlair.jar
View file

Binary file not shown.

BIN
TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands$1.class
View file

Binary file not shown.

BIN
TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/Commands.class
View file

Binary file not shown.

BIN
TheButtonAutoFlair/bin/tk/sznp/thebuttonautoflair/PlayerListener.class
View file

Binary file not shown.

9
TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java
View file

@ -46,18 +46,21 @@ public class Commands implements CommandExecutor {
.getUniqueId()); // 2015.08.08. .getUniqueId()); // 2015.08.08.
if (!p.CommentedOnReddit if (!p.CommentedOnReddit
&& !args[0].toLowerCase().equals("admin") && !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"); player.sendMessage("§cError: You need to write your username to the reddit thread at /r/TheButtonMinecraft§r");
return true; return true;
} }
if (!p.FlairRecognised if (!p.FlairRecognised
&& !args[0].toLowerCase().equals("admin") && !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."); player.sendMessage("Sorry, but your flair isn't recorded. Please ask a mod to set it for you.");
return true; return true;
} }
if (!p.FlairDecided && !args[0].toLowerCase().equals("admin") 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"); player.sendMessage("Please select between /u nonpresser and /u cantpress");
return true; return true;
} }

11
TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java
View file

@ -334,9 +334,14 @@ public class PlayerListener implements Listener { // 2015.07.16.
MinigamePlayer mp = Minigames.plugin.pdata.getMinigamePlayer(e MinigamePlayer mp = Minigames.plugin.pdata.getMinigamePlayer(e
.getPlayer()); .getPlayer());
// System.out.println("B"); // 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; return;
// System.out.println("C"); // System.out.println("C");
ItemStack item = e.getItem().getItemStack(); ItemStack item = e.getItem().getItemStack();