Some small fixes

Check Discord Changelog channel

Nautilus.Game.Arcade/src/nautilus/game/arcade/command/SetCommand.java

@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
+import nautilus.game.arcade.game.games.Beta;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -168,6 +169,10 @@ public class SetCommand extends CommandBase<ArcadeManager>
 
 		if (Plugin.GetGame() == null)
 		{
+			if(Beta.enableBeta && gameType == GameType.CastleSiege){
+				gameType = GameType.BetaCastleSiege;
+			}
+
 			creationManager.setNextGameType(gameType);
 		}
 		else

Nautilus.Game.Arcade/src/nautilus/game/arcade/command/StopCommand.java

@@ -1,5 +1,7 @@
 package nautilus.game.arcade.command;
 
+import nautilus.game.arcade.GameType;
+import nautilus.game.arcade.game.games.Beta;
 import org.bukkit.entity.Player;
 import org.bukkit.event.HandlerList;
 

Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java

@@ -33,6 +33,7 @@ import nautilus.game.arcade.events.PlayerGameRespawnEvent;
 import nautilus.game.arcade.events.PlayerPrepareTeleportEvent;
 import nautilus.game.arcade.events.PlayerStateChangeEvent;
 import nautilus.game.arcade.game.GameTeam.PlayerState;
+import nautilus.game.arcade.game.games.Beta;
 import nautilus.game.arcade.game.games.castlesiegenew.CastleSiegeNew;
 import nautilus.game.arcade.game.modules.AntiExpOrbModule;
 import nautilus.game.arcade.game.modules.Module;
@@ -1757,6 +1758,10 @@ public abstract class Game extends ListenerComponent implements Lifetimed
 
 	public void setGame(GameType gameType, Player caller, boolean inform)
 	{
+		if(Beta.enableBeta && gameType == GameType.CastleSiege){
+			gameType = GameType.BetaCastleSiege;
+		}
+
 		Manager.GetGameCreationManager().setNextGameType(gameType);
 
 		// End Current
@@ -1774,6 +1779,13 @@ public abstract class Game extends ListenerComponent implements Lifetimed
 		}
 	}
 
+	public void setExactGame(GameType gameType)
+	{
+		Manager.GetGameCreationManager().setNextGameType(gameType);
+		SetState(GameState.Dead);
+		Announce(C.cRed + "BETA ENABLED: Set next game to BETA " + gameType.getName() + ".");
+	}
+
 	public void endGame(GameTeam winningTeam)
 	{
 		AnnounceEnd(winningTeam);

Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/castlesiegenew/CastleSiegeNew.java

@@ -17,6 +17,7 @@ import nautilus.game.arcade.events.PlayerGameRespawnEvent;
 import nautilus.game.arcade.game.GameTeam;
 import nautilus.game.arcade.game.TeamGame;
 import nautilus.game.arcade.game.games.Beta;
+import nautilus.game.arcade.game.games.castlesiegebeta.BetaCastleSiege;
 import nautilus.game.arcade.game.games.castlesiegenew.kits.*;
 import nautilus.game.arcade.game.modules.SpawnShieldModule;
 import nautilus.game.arcade.game.modules.compass.CompassModule;
@@ -71,6 +72,8 @@ public class CastleSiegeNew extends TeamGame
 	private PlayerInfo _playerInfo;
 	private CombatComponent _killer;
 
+	private ArcadeManager manager;
+
 	public static final String[] CSDESCRIPTION = {
 			C.cAqua + "Defenders" + C.cWhite + " must defend the King.",
 			C.cAqua + "Defenders" + C.cWhite + " win when the sun rises.",
@@ -122,8 +125,6 @@ public class CastleSiegeNew extends TeamGame
 	public CastleSiegeNew(ArcadeManager manager)
 	{
 
-
-
 		super(manager, GameType.CastleSiege, new Kit[]
 				{
 						new KitHumanWolf(manager),
@@ -188,7 +189,6 @@ public class CastleSiegeNew extends TeamGame
 	@Override
 	public void ParseData()
 	{
-
 		_defenders = GetTeam(ChatColor.AQUA);
 		_defenders.SetName("Defenders");
 		_defenders.SetRespawnTime(WOLF_RESPAWN_TIME);

Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/button/ChooseMapButton.java

@@ -39,4 +39,4 @@ public class ChooseMapButton implements IButton
 		player.closeInventory();
 		return;
 	}
-}
+}

Nautilus.Game.Arcade/src/nautilus/game/arcade/gui/privateServer/page/SetGamePage.java

@@ -83,14 +83,6 @@ public class SetGamePage extends BasePage
 		{
 			if (clickType == ClickType.LEFT)
 			{
-//				if(type == GameType.CastleSiege){
-//					if(Beta.enableBeta){
-//						getPlugin().GetGame().setGame(GameType.BetaCastleSiege, player, true);
-//					}
-//					else{
-//						getPlugin().GetGame().setGame(GameType.CastleSiege, player, true);
-//					}
-//				}
 				getPlugin().GetGame().setGame(type, player, true);
 				player.closeInventory();
 			}

Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameCreationManager.java

@@ -16,6 +16,7 @@ import nautilus.game.arcade.GameType;
 import nautilus.game.arcade.events.GameStateChangeEvent;
 import nautilus.game.arcade.game.Game;
 import nautilus.game.arcade.game.Game.GameState;
+import nautilus.game.arcade.game.games.Beta;
 import nautilus.game.arcade.managers.voting.Vote;
 import nautilus.game.arcade.managers.voting.VotingManager;
 import nautilus.game.arcade.managers.voting.types.GameVote;
@@ -60,6 +61,7 @@ public class GameCreationManager implements Listener
 	@EventHandler
 	public void nextGame(UpdateEvent event)
 	{
+
 		if (event.getType() != UpdateType.FAST || Manager.GetGameList().isEmpty())
 		{
 			return;
@@ -162,6 +164,10 @@ public class GameCreationManager implements Listener
 				GameVote gameVote = ((GameVote) _votingManager.getFinishedVote());
 
 				gameType = gameVote.getWinner();
+				
+				if(Beta.enableBeta && gameType == GameType.CastleSiege){
+					gameType = GameType.BetaCastleSiege;
+				}
 				MapPref = gameVote.getWinningMapVote().getWinner().getName();
 			}
 			else if (vote instanceof MapVote)
@@ -186,7 +192,12 @@ public class GameCreationManager implements Listener
 		// /game set or map vote
 		if (_nextGame != null)
 		{
-			gameType = _nextGame;
+			if(Beta.enableBeta && _nextGame == GameType.CastleSiege){
+				gameType = GameType.BetaCastleSiege;
+			}
+			else{
+				gameType = _nextGame;
+			}
 		}
 
 		//Pick Game