diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index 24e9eb2..23e626e 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/plugin.yml b/TheButtonAutoFlair/plugin.yml index 773f17e..4bd34de 100644 --- a/TheButtonAutoFlair/plugin.yml +++ b/TheButtonAutoFlair/plugin.yml @@ -12,6 +12,8 @@ commands: description: Send message in Out-of-Character usage: "&cUsage: /ooc &r" unlol: - description: Unlol the last lol. + description: Unlaugh the last laugh. + unlaugh: + description: Unlaugh the last laugh. author: NorbiPeti depend: [Essentials, Towny, Minigames] diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java index ddb761e..7cfde70 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java @@ -112,24 +112,21 @@ public class Commands implements CommandExecutor { break; } case "ignore": { - /* - * if (p.FlairState.equals(FlairStates.NoComment)) { - * player.sendMessage( - * "§cError: You need to write your username to the reddit thread at /r/TheButtonMinecraft§r" - * ); return true; } if - * (p.FlairState.equals(FlairStates.Commented)) { - * player.sendMessage( - * "Sorry, but your flair isn't recorded. Please ask a mod to set it for you." - * ); return true; } if - * (!p.FlairState.equals(FlairStates.Ignored)) { - * p.FlairState = FlairStates.Ignored; p.SetFlairTime(""); - * p.UserName = ""; player.sendMessage( - * "§bYou have removed your flair. You can still use /u accept to get one.§r" - * ); } else - * player.sendMessage("§cYou already removed your flair.§r" - * ); - */ - player.sendMessage("§cSorry, but ignoring the flair is no longer possible. As with the original Button, you can't undo what already happened."); + if (p.FlairState.equals(FlairStates.Accepted)) { + player.sendMessage("§cSorry, but ignoring the flair is no longer possible. As with the original Button, you can't undo what already happened."); + return true; + } + if (p.FlairState.equals(FlairStates.Commented)) { + player.sendMessage("Sorry, but your flair isn't recorded. Please ask a mod to set it for you."); + return true; + } + if (!p.FlairState.equals(FlairStates.Ignored)) { + p.FlairState = FlairStates.Ignored; + p.SetFlairTime(""); + p.UserName = ""; + player.sendMessage("§bYou have removed your flair. You can still use /u accept to get one.§r"); + } else + player.sendMessage("§cYou already removed your flair.§r"); break; } case "admin": // 2015.08.09. @@ -194,6 +191,7 @@ public class Commands implements CommandExecutor { } return true; } + case "unlaugh": case "unlol": { Player p = null; if (Lastlol != null diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class index bbbb981..54f0041 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class index 446d534..ceaa88f 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class differ