diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java index f833f0200..38839f738 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ServerManager.java @@ -865,6 +865,11 @@ public class ServerManager extends MiniPlugin return _serverNpcShopMap.get("Bawk Bawk Battles"); } + public ServerNpcShop getMobaShop() + { + return _serverNpcShopMap.get("Heroes of GWEN"); + } + public BoosterManager getBoosterManager() { return _boosterManager; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/MOBAServerTypePage.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/MOBAServerTypePage.java index fa6b999e8..3fbb186f3 100644 --- a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/MOBAServerTypePage.java +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/MOBAServerTypePage.java @@ -26,14 +26,14 @@ public class MOBAServerTypePage extends ShopPageBase C.Reset + "at all costs!", }, "CA", "Castle_Assault", new SelectCAButton(this)); - add(4, Material.DIAMOND_CHESTPLATE, C.cYellowB + "Castle Assault TDM " + C.cGray + "Team PvP", new String[] + add(4, Material.PRISMARINE_SHARD, C.cYellowB + "Heroes of GWEN " + C.cGray + "Team Game", new String[] { - (_extraValue ? C.cAquaB : C.cWhiteB) + "NEW GAME", + (_extraValue ? C.cAquaB : C.cWhiteB) + "FULL RELEASE", C.Reset + "", - C.Reset + "Combatants must battle to", - C.Reset + "win glory for their team", - C.Reset + "by slaying the enemy!", - }, "CATDM", "Castle_Assault_TDM", new SelectCATDMButton(this)); + C.Reset + "Face off in a crazy 4v4", + C.Reset + "battle with many different", + C.Reset + "Heroes and Abilities!", + }, "MOBA", "Heroes_of_GWEN", new SelectMOBAButton(this)); add(6, Material.QUARTZ_BLOCK, C.cYellowB + "Speed Builders " + C.cGray + "Competitive Building", new String[] { @@ -761,6 +762,11 @@ public class ServerGameMenu extends ShopPageBase getPlugin().getBawkShop().attemptShopOpen(player); } + public void openMoba(Player player) + { + getPlugin().getMobaShop().attemptShopOpen(player); + } + /* ADDITIONAL LORES; diff --git a/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectMOBAButton.java b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectMOBAButton.java new file mode 100644 index 000000000..c65848b38 --- /dev/null +++ b/Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/button/SelectMOBAButton.java @@ -0,0 +1,22 @@ +package mineplex.hub.server.ui.button; + +import mineplex.core.shop.item.IButton; +import mineplex.hub.server.ui.ServerGameMenu; +import org.bukkit.entity.Player; +import org.bukkit.event.inventory.ClickType; + +public class SelectMOBAButton implements IButton +{ + private ServerGameMenu _menu; + + public SelectMOBAButton(ServerGameMenu menu) + { + _menu = menu; + } + + @Override + public void onClick(Player player, ClickType clickType) + { + _menu.openMoba(player); + } +} diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/structure/tower/Tower.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/structure/tower/Tower.java index c8823b984..6aaf95375 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/structure/tower/Tower.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/structure/tower/Tower.java @@ -80,10 +80,7 @@ public class Tower _guardian = new DisguiseGuardian(_stand); _host.getArcadeManager().GetDisguise().disguise(_guardian); - if (!_firstTower) - { - _guardian.setElder(true); - } + //_guardian.setElder(!_firstTower); _guardian.setCustomNameVisible(true); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index d22502170..f046626b4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -123,7 +123,6 @@ public class GameHostManager implements Listener legendGames.add(GameType.Skywars); legendGames.add(GameType.SpeedBuilders); legendGames.add(GameType.TypeWars); - legendGames.add(GameType.MOBA); // Team variants - Currently being remade. /* legendGames.add(GameType.DragonEscapeTeams);