diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index fee5ae5..47c2da5 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java index 509d217..ddf741e 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java @@ -141,8 +141,7 @@ public class Commands implements CommandExecutor { case "announce": DoAnnounce(player, args, null); break; - case "name": - { + case "name": { if (args.length == 1) { player.sendMessage("§cUsage: /u name §r"); break; @@ -175,16 +174,29 @@ public class Commands implements CommandExecutor { DoKittyCannon(player, args); break; case "c": - if (PluginMain.permission.has(player, "tbmc.rainbow")) - { - p.RainbowPresserColorMode = !p.RainbowPresserColorMode; - if(p.RainbowPresserColorMode) - player.sendMessage("§eRainbow colors §aenabled."); - else - player.sendMessage("§eRainbow colors §cdisabled."); + if (args.length < 2) { + if (PluginMain.permission.has(player, "tbmc.rainbow")) { + p.RainbowPresserColorMode = !p.RainbowPresserColorMode; + p.OtherColorMode = 0xFF; + if (p.RainbowPresserColorMode) + player.sendMessage("§eRainbow colors §aenabled."); + else + player.sendMessage("§eRainbow colors §cdisabled."); + } else { + player.sendMessage("§cYou don't have permission for this command. Donate to get it!"); + return true; + } + } else { + if (PluginMain.permission.has(player, "tbmc.admin")) { + p.RainbowPresserColorMode = false; + p.OtherColorMode = Short.parseShort(args[1], 16); + if (p.OtherColorMode != 0xFF) + player.sendMessage("§eMessage color set to §" + + p.OtherColorMode + p.OtherColorMode); + else + player.sendMessage("§eMessage color reset."); + } } - else - return false; break; default: return false; diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java index 14f62fd..a60fead 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.java @@ -28,6 +28,7 @@ public class MaybeOfflinePlayer { public boolean SendingLink = false; public int FDeaths; public boolean RainbowPresserColorMode = false; + public short OtherColorMode = 0xFF; public UUID UUID; diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java index d70cd46..6f551ee 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PlayerListener.java @@ -263,6 +263,10 @@ public class PlayerListener implements Listener { // 2015.07.16. rpc = 0; } } + if (player.OtherColorMode != 0xFF) { + formattedmessage = String.format("§%x%s", player.OtherColorMode, + formattedmessage); + } if (!hadurls) { for (Player p : PluginMain.GetPlayers()) { // 2015.08.12. @@ -1019,8 +1023,8 @@ public class PlayerListener implements Listener { // 2015.07.16. public void onPlayerMove(PlayerMoveEvent e) { // minecraft:tp @a[x=190,y=-80,z=45,dx=5,dy=50,dz=5] 190 1 45 if (e.getPlayer().getWorld().getName().equals("wilds") - && e.getTo().getBlockX() > 185 && e.getTo().getBlockX() < 200 - && e.getTo().getBlockZ() > 40 && e.getTo().getBlockZ() < 60 + && e.getTo().getBlockX() > 100 && e.getTo().getBlockX() < 250 + && e.getTo().getBlockZ() > 0 && e.getTo().getBlockZ() < 200 && e.getTo().getBlockY() < -64) { final Player p = e.getPlayer(); p.setVelocity(new Vector(0, 0, 0)); diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class index 6fb7e23..2501abe 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 21b5e1f..c292ee5 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class index 67b98a1..5fcb533 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/MaybeOfflinePlayer.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class index 0ae59ed..f13a8b6 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$3.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class index 57321d0..f233306 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener$4.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class index d4a207c..4077048 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PlayerListener.class differ