From 4d872389cd608cdde4c35c03dd3d5a8d0285db00 Mon Sep 17 00:00:00 2001 From: Sam Date: Sat, 7 Jul 2018 15:19:19 +0100 Subject: [PATCH] If an MPS and there's no team balaning, put players on teams instantly --- .../src/nautilus/game/arcade/ArcadeManager.java | 2 +- .../nautilus/game/arcade/game/team/GameTeamModule.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java index 89d52dd31..bf2225ac4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -507,7 +507,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation .recalculate(); scoreboard.get(ArcadeScoreboardLine.PLAYERS_NAME).write(C.cYellowB + "Players"); - scoreboard.get(ArcadeScoreboardLine.KIT_NAME).write(C.cGrayB + "Kit"); + scoreboard.get(ArcadeScoreboardLine.KIT_NAME).write(C.cGoldB + "Kit"); scoreboard.get(ArcadeScoreboardLine.SERVER_NAME).write(C.cAquaB + "Server"); scoreboard.get(ArcadeScoreboardLine.SERVER_VALUE).write(UtilServer.getServerName()); } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/team/GameTeamModule.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/team/GameTeamModule.java index a8cf633be..08d73f2f2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/team/GameTeamModule.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/team/GameTeamModule.java @@ -17,6 +17,7 @@ import mineplex.core.common.util.UtilPlayer; import mineplex.core.friend.FriendManager; import mineplex.core.party.Party; +import nautilus.game.arcade.ArcadeManager; import nautilus.game.arcade.events.GameStateChangeEvent; import nautilus.game.arcade.game.Game; import nautilus.game.arcade.game.Game.GameState; @@ -209,6 +210,15 @@ public class GameTeamModule extends Module public void addPlayerQueue(Player player, GameTeam team) { + ArcadeManager manager = getGame().getArcadeManager(); + + // Is MPS and No team balancing + if (manager.GetGameHostManager().isPrivateServer() && !manager.IsTeamBalance()) + { + getGame().SetPlayerTeam(player, team, true); + return; + } + GameTeam previous = _preferences.put(player, team); if (team.equals(previous))