diff --git a/Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java b/Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java index 232352662..4ab7fbbc6 100644 --- a/Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java +++ b/Plugins/Mineplex.Cache/src/mineplex/cache/player/PlayerCache.java @@ -39,7 +39,7 @@ public class PlayerCache catch (Exception exception) { System.out.println("Error adding player info in PlayerCache : " + exception.getMessage()); -// exception.printStackTrace(); + exception.printStackTrace(); } } @@ -47,9 +47,8 @@ public class PlayerCache { try { - System.out.println("Getting PlayerCache for " + uuid.toString()); PlayerInfo playerInfo = _repository.getElement(uuid.toString()); - System.out.println("Got playerINfo: " + playerInfo); + System.out.println("Got playerInfo: " + playerInfo); if (playerInfo != null) { System.out.println("account id: " + playerInfo.getAccountId()); diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java index 0f3e7d47f..bef877efd 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java @@ -19,6 +19,9 @@ import org.bukkit.World; import org.bukkit.craftbukkit.v1_8_R3.CraftWorld; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; +import org.bukkit.event.EventHandler; +import org.bukkit.event.player.PlayerJoinEvent; +import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.scheduler.BukkitRunnable; public class UtilTextTop @@ -38,7 +41,7 @@ public class UtilTextTop // Logic public static final int EntityDragonId = 777777; public static final int EntityWitherId = 777778; - public static final UUID BossUUID = UUID.randomUUID(); + public static final UUID BossUUID = UUID.fromString("178f5cde-2fb0-3e73-8296-967ec7e46748"); private static HashMap _lastUpdated = new HashMap(); // Display @@ -151,6 +154,15 @@ public class UtilTextTop UtilPlayer.sendPacket(player, destroyWitherPacket); } + @EventHandler + public void onPlayerJoin(PlayerJoinEvent event) + { + if (UtilPlayer.is1_9(event.getPlayer())) + { + deleteOld(event.getPlayer()); + } + } + public static PacketPlayOutSpawnEntityLiving getDragonPacket(String text, double healthPercent, Location loc) { PacketPlayOutSpawnEntityLiving mobPacket = new PacketPlayOutSpawnEntityLiving(); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseBat.java b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseBat.java index 3f23cc436..b5100c880 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseBat.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/disguise/disguises/DisguiseBat.java @@ -4,7 +4,7 @@ import net.minecraft.server.v1_8_R3.EntityBat; import org.bukkit.entity.*; -public class DisguiseBat extends DisguiseAnimal +public class DisguiseBat extends DisguiseCreature { public DisguiseBat(org.bukkit.entity.Entity entity) { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java index d0f56c262..588584da6 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java @@ -296,7 +296,7 @@ public class Hologram packet.uuid = UUID.randomUUID(); // Setup datawatcher for armor stand - watcher.a(0, (byte) 32, EntityArmorStand.META_ENTITYDATA, (byte) 0); + watcher.a(0, (byte) 32, EntityArmorStand.META_ENTITYDATA, (byte) 32); watcher.a(2, lineOfText, EntityArmorStand.META_CUSTOMNAME, lineOfText); watcher.a(3, (byte) 1, EntityArmorStand.META_CUSTOMNAME_VISIBLE, true); diff --git a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java index 34c2a8c1f..e9d4e2e63 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/recharge/Recharge.java @@ -172,7 +172,7 @@ public class Recharge extends MiniPlugin //Recharging if (Get(player).containsKey(ability)) { - if (inform) + if (inform && !Get(player).get(ability).DisplayForce && !Get(player).get(ability).AttachItem) { UtilPlayer.message(player, F.main("Recharge", "You cannot use " + F.skill(abilityFull) + " for " + F.time(UtilTime.convertString((Get(player).get(ability).GetRemaining()), 1, TimeUnit.FIT)) + ".")); @@ -217,7 +217,7 @@ public class Recharge extends MiniPlugin } else { - if (inform) + if (inform && !Get(player).get(ability).DisplayForce && !Get(player).get(ability).AttachItem) UtilPlayer.message(player, F.main("Recharge", "You cannot use " + F.skill(ability) + " for " + F.time(UtilTime.convertString((Get(player).get(ability).GetRemaining()), 1, TimeUnit.FIT)) + ".")); diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java index 42f56f53e..246b93fc2 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java @@ -40,6 +40,7 @@ public class ServerGameMenu extends ShopPageBase @Override protected void buildPage() { + /* addButton(2, new ItemBuilder(Material.RED_ROSE).setTitle(C.cYellowB + "Valentines Vendetta " + C.cGray + "Save Valentines!").addLore(new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "LIMITED TIME GAME", @@ -50,8 +51,9 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "", C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("VV") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectVVButton(this)); + */ - addButton(4, new ItemBuilder(Material.QUARTZ_BLOCK).setTitle(C.cYellowB + "Speed Builders " + C.cGray + "Competitive Building").addLore(new String[] + addButton(2, new ItemBuilder(Material.QUARTZ_BLOCK).setTitle(C.cYellowB + "Speed Builders " + C.cGray + "Competitive Building").addLore(new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", C.Reset + "", @@ -62,6 +64,28 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("SB") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectSBButton(this)); + addButton(4, new ItemBuilder(Material.BOOK_AND_QUILL).setTitle(C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary").addLore(new String[] + { + (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW UPDATE", + C.Reset + "", + C.Reset + "Players take turns at drawing a random", + C.Reset + "word. Whoever guesses it within the time", + C.Reset + "limit gets some points!", + C.Reset + "", + C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("DMT") + C.Reset + " other players!", + }).setHideInfo(true).build(), new SelectDMTButton(this)); + + addButton(6, new ItemBuilder(Material.TNT).setTitle(C.cYellowB + "Dragon Escape " + C.cGray + "Fast Paced Parkour").addLore(new String[] + { + (_extraValue ? C.cAquaB : C.cWhiteB) + "FEATURED ARCADE GAME", + C.Reset + "", + C.Reset + "Douglas the Dragon is angry", + C.Reset + "You better RUNNNNN!", + C.Reset + "Last player alive wins", + C.Reset + "", + C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("DE") + C.Reset + " other players!" + }).setHideInfo(true).build(), new SelectFEATButton(this, "Dragon Escape")); + /* addButton(6, new ItemBuilder(Material.IRON_SWORD).setTitle(C.cYellowB + "Gladiators" + C.cGray + " Bracketted Deathmatch").addLore(new String[] { @@ -88,6 +112,7 @@ public class ServerGameMenu extends ShopPageBase }).setHideInfo(true).build(), new SelectFEATButton(this, "Micro Battle")); */ + /* addButton(6, new ItemBuilder(Material.TNT).setTitle(C.cYellowB + "Bomb Lobbers " + C.cGray + "TNT Mayhem").addLore(new String[] { (_extraValue ? C.cAquaB : C.cWhiteB) + "FEATURED ARCADE GAME", @@ -97,6 +122,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "", C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("BL") + C.Reset + " other players!" }).setHideInfo(true).build(), new SelectFEATButton(this, "Bomb Lobbers")); + */ addButton(9, new ItemBuilder(Material.IRON_PICKAXE).setTitle(C.cYellowB + "The Bridges " + C.cGray + "4 Team Survival").addLore(new String[] { @@ -201,7 +227,7 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("BH") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectBHButton(this)); - addButton(27, new ItemBuilder(Material.TNT).setTitle(C.cYellowB + "MineStrike " + C.cGray + "Team Survival").addLore(new String[] + addButton(28, new ItemBuilder(Material.TNT).setTitle(C.cYellowB + "MineStrike " + C.cGray + "Team Survival").addLore(new String[] { C.Reset + "", C.Reset + "One team must defend two bomb sites from", @@ -211,21 +237,11 @@ public class ServerGameMenu extends ShopPageBase C.Reset + "Join " + C.cGreen + getPlugin().getGroupTagPlayerCount("MS") + C.Reset + " other players!", }).setHideInfo(true).build(), new SelectMSButton(this)); - addButton(29, new ItemBuilder(Material.BOOK_AND_QUILL).setTitle(C.cYellowB + "Draw My Thing " + C.cGray + "Pictionary").addLore(new String[] - { - C.Reset + "", - C.Reset + "Players take turns at drawing a random", - C.Reset + "word. Whoever guesses it within the time", - C.Reset + "limit gets some points!", - C.Reset + "", - C.Reset + "Join " + ChatColor.GREEN + getPlugin().getGroupTagPlayerCount("DMT") + C.Reset + " other players!", - }).setHideInfo(true).build(), new SelectDMTButton(this)); + addButton(30, _superSmashCycle.get(_ssmIndex), new SelectSSMButton(this)); - addButton(31, _superSmashCycle.get(_ssmIndex), new SelectSSMButton(this)); + addButton(32, _minigameCycle.get(_minigameIndex), new SelectMINButton(this)); - addButton(33, _minigameCycle.get(_minigameIndex), new SelectMINButton(this)); - - addButton(35, new ItemBuilder(Material.WOOD).setTitle(C.cYellowB + "Master Builders " + C.cGray + "Creative Build").setLore(new String[] + addButton(34, new ItemBuilder(Material.WOOD).setTitle(C.cYellowB + "Master Builders " + C.cGray + "Creative Build").setLore(new String[] { C.Reset + "", C.Reset + "Players are given a Build Theme and ", diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/tools/Tool.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/tools/Tool.java index 11893a40e..4470fb7e6 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/tools/Tool.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/draw/tools/Tool.java @@ -40,6 +40,9 @@ public abstract class Tool public void start(PlayerInteractEvent event) { + if (_start != null) + return; + if (!UtilEvent.isAction(event, ActionType.R)) return;