Merge remote-tracking branch 'refs/remotes/origin/develop' into update/castle-siege

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;

Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/MOBAServerTypePage.java

@@ -26,14 +26,14 @@ public class MOBAServerTypePage extends ShopPageBase<ServerManager, ServerNpcSho
 	@Override
 	protected void buildPage()
 	{
-		setItem(12, new ItemBuilder(Material.SKULL_ITEM, 1, (byte) 3).setTitle(C.Reset + C.cGold + "Play " + C.cYellow + "Heroes of GWEN")
+		setItem(12, new ItemBuilder(Material.PRISMARINE_SHARD).setTitle(C.Reset + C.cGold + "Play " + C.cYellow + "Heroes of GWEN")
 				.addLore(new String[]
 						{
 								C.Reset + "",
 								C.Reset + C.cGreen + "Click to Play",
 						}).build());
 
-		setItem(14, new ItemBuilder(Material.SKULL_ITEM, 1, (byte) 3).setTitle(C.Reset + C.cYellow + "Heroes of GWEN " + C.cGold + "Training")
+		setItem(14, new ItemBuilder(Material.SKULL_ITEM, (byte) 3).setTitle(C.Reset + C.cYellow + "Heroes of GWEN " + C.cGold + "Training")
 				.addLore(new String[]
 						{
 								C.Reset + "",

Plugins/Mineplex.Hub/src/mineplex/hub/server/ui/ServerGameMenu.java

@@ -3,6 +3,7 @@ package mineplex.hub.server.ui;
 import java.util.ArrayList;
 import java.util.List;
 
+import mineplex.hub.server.ui.button.SelectMOBAButton;
 import org.bukkit.ChatColor;
 import org.bukkit.Color;
 import org.bukkit.Material;
@@ -80,14 +81,14 @@ public class ServerGameMenu extends ShopPageBase<ServerManager, QuickShop>
 						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 + "Face off in a crazy 4v4",
-						C.Reset + "win glory for their team",
+						C.Reset + "battle with many different",
-						C.Reset + "by slaying the enemy!",
+						C.Reset + "Heroes and Abilities!",
-				}, "CATDM", "Castle_Assault_TDM", new SelectCATDMButton(this));
+				}, "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<ServerManager, QuickShop>
 		getPlugin().getBawkShop().attemptShopOpen(player);
 	}
 
+	public void openMoba(Player player)
+	{
+		getPlugin().getMobaShop().attemptShopOpen(player);
+	}
+
 	/*
 		ADDITIONAL LORES;
 

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);
+	}
+}

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(!_firstTower);
-		{
-			_guardian.setElder(true);
-		}
 
 		_guardian.setCustomNameVisible(true);
 

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);