diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index 4ff44d8..e8a6953 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java index 2cf3ee3..170828b 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java @@ -180,7 +180,7 @@ public class PlayerListener implements Listener { // 2015.07.16. "(?i)" + Pattern.quote(p.getName()), color + p.getName() - + (greentext ? "§2" + + (greentext ? "§a" : player.CurrentChannel.DisplayName .substring(0, 2))); } @@ -212,7 +212,7 @@ public class PlayerListener implements Listener { // 2015.07.16. message = message.replaceAll( "(?i)" + Pattern.quote(nwithoutformatting), n - + (greentext ? "§2" + + (greentext ? "§a" : player.CurrentChannel.DisplayName .substring(0, 2))); } @@ -274,7 +274,7 @@ public class PlayerListener implements Listener { // 2015.07.16. "#" + original, String.format( "\",\"color\":\"%s\"},{\"text\":\"#%s\",\"color\":\"blue\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"https://twitter.com/hashtag/%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Open on Twitter\",\"color\":\"blue\"}]}}},{\"text\":\"", - (greentext ? "dark_green" + (greentext ? "green" : player.CurrentChannel.Color), original, original)); @@ -289,16 +289,16 @@ public class PlayerListener implements Listener { // 2015.07.16. item, String.format( "\",\"color\":\"%s\"},{\"text\":\"%s\",\"color\":\"%s\",\"underlined\":\"true\",\"clickEvent\":{\"action\":\"open_url\",\"value\":\"%s\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"Open URL\",\"color\":\"blue\"}]}}},{\"text\":\"", - (greentext ? "dark_green" + (greentext ? "green" : player.CurrentChannel.Color), - url, (greentext ? "dark_green" + url, (greentext ? "green" : player.CurrentChannel.Color), url)); } catch (MalformedURLException e) { } json.append(String.format("{\"text\":\"%s\",\"color\":\"%s\"}]", - finalstring, (greentext ? "dark_green" + finalstring, (greentext ? "green" : player.CurrentChannel.Color))); if (player.CurrentChannel.equals(Channel.TownChat) || player.CurrentChannel.equals(Channel.NationChat)) @@ -661,11 +661,13 @@ public class PlayerListener implements Listener { // 2015.07.16. private boolean ActiveF = false; private int FCount = 0; private MaybeOfflinePlayer FPlayer = null; - private Timer Ftimer; + public static int AlphaDeaths; @EventHandler public void onPlayerDeath(PlayerDeathEvent e) { + if (e.getEntity().getName().equals("Alpha_Bacca44")) + AlphaDeaths++; if (!Minigames.plugin.pdata.getMinigamePlayer(e.getEntity()) .isInMinigame() && new Random().nextBoolean()) { if (Ftimer != null) diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java index 85411b7..c2b650a 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java @@ -100,7 +100,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. .getTownyUniverse(); Towns = new ArrayList(TU.getTownsMap().values()); Nations = new ArrayList(TU.getNationsMap().values()); - + Runnable r = new Runnable() { public void run() { ThreadMethod(); @@ -242,7 +242,8 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. break; case "unknown": if (text.equals("-1")) // If true, only non-presser/can't press; if - // false, any flair + // false, any flair (but we can still detect + // can't press) { try { if (CheckForJoinDate(p)) { @@ -256,8 +257,18 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. e.printStackTrace(); } } else { - p.FlairState = FlairStates.Commented; // Flair unknown - p.SetFlairColor(0); + try { + if (CheckForJoinDate(p)) { + p.FlairState = FlairStates.Commented; // Flair unknown + p.SetFlairColor(0); + } else { + p.SetFlair(0xf, "--"); + } + } catch (Exception e) { + p.FlairState = FlairStates.Commented; // Flair unknown + p.SetFlairColor(0); + e.printStackTrace(); + } } return; default: @@ -324,6 +335,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. .getDouble("notificationpitch"); AnnounceTime = yc.getInt("announcetime"); AnnounceMessages.addAll(yc.getStringList("announcements")); + PlayerListener.AlphaDeaths = yc.getInt("alphadeaths"); } System.out.println("The Button Minecraft plugin loaded files!"); } catch (IOException e) { @@ -345,6 +357,7 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. yc.set("notificationpitch", PlayerListener.NotificationPitch); yc.set("announcetime", AnnounceTime); yc.set("announcements", AnnounceMessages); + yc.set("alphadeaths", PlayerListener.AlphaDeaths); yc.save(file); System.out.println("The Button Minecraft plugin saved files!"); } catch (IOException e) { diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class index b48f3f6..b109aa1 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$2.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class index ae25cf3..3642371 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class index da6ce02..a2886c4 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class differ