diff --git a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java index 84c33a76f..2d4cbf8f9 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/personalServer/PersonalServerManager.java @@ -150,7 +150,7 @@ public class PersonalServerManager extends MiniPlugin } final ServerGroup serverGroup = new ServerGroup("COM-" + community.getId(), "COM-" + community.getName(), "COM-" + community.getId(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, "", true, "Lobby_MCS.zip", "Arcade.jar", "plugins/Arcade/", 15, 20, - true, false, false, community.getFavoriteGame().name(), "", "", "Community", true, false, false, true, false, false, true, false, false, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", ""); + true, false, false, community.getFavoriteGame().name(), "", "", "Community", true, false, false, true, false, false, true, false, false, false, false, false, false, true, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", ""); _repository.updateServerGroup(serverGroup); runSync(() -> @@ -183,7 +183,7 @@ public class PersonalServerManager extends MiniPlugin } final ServerGroup serverGroup = new ServerGroup(serverName, serverName, host.getName(), ram, cpu, 1, 0, UtilMath.random.nextInt(250) + 19999, "", true, "Lobby_MPS.zip", "Arcade.jar", "plugins/Arcade/", minPlayers, maxPlayers, - true, false, false, games, "", "", "Player", true, event, false, true, false, true, true, false, false, false, false, false, false, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", ""); + true, false, false, games, "", "", "Player", true, event, false, true, false, true, true, false, false, false, false, false, false, true, true, true, true, false, false, "", _us ? Region.US : Region.EU, "", "", "", ""); getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), () -> { diff --git a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java index 56a0a2dce..b1f2f8be5 100644 --- a/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java +++ b/Plugins/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java @@ -50,7 +50,7 @@ public class ServerGroup private boolean _hotbarInventory; private boolean _hotbarHubClock; private boolean _playerKickIdle; - private boolean _generateFreeVersions; + private boolean _hardMaxPlayerCap; private String _games; private String _modes; @@ -91,7 +91,7 @@ public class ServerGroup _pvp = Boolean.valueOf(data.get("pvp")); _tournament = Boolean.valueOf(data.get("tournament")); _tournamentPoints = Boolean.valueOf(data.get("tournamentPoints")); - _generateFreeVersions = Boolean.valueOf(data.get("generateFreeVersions")); + _hardMaxPlayerCap = Boolean.valueOf(data.get("allowOverflow")); _games = data.get("games"); _modes = data.get("modes"); _boosterGroup = data.get("boosterGroup"); @@ -129,7 +129,7 @@ public class ServerGroup public ServerGroup(String name, String prefix, String host, int ram, int cpu, int totalServers, int joinable, int portSection, String uptimes, boolean arcade, String worldZip, String plugin, String configPath , int minPlayers, int maxPlayers, boolean pvp, boolean tournament, boolean tournamentPoints, String games, String modes, String boosterGroup, String serverType, boolean noCheat, boolean worldEdit, boolean teamRejoin , boolean teamAutoJoin, boolean teamForceBalance, boolean gameAutoStart, boolean gameTimeout, boolean gameVoting, boolean mapVoting, boolean rewardGems, boolean rewardItems, boolean rewardStats - , boolean rewardAchievements, boolean hotbarInventory, boolean hotbarHubClock, boolean playerKickIdle, boolean staffOnly, boolean whitelist, String resourcePack, Region region + , boolean rewardAchievements, boolean hotbarInventory, boolean hotbarHubClock, boolean playerKickIdle, boolean hardMaxPlayerCap, boolean staffOnly, boolean whitelist, String resourcePack, Region region , String teamServerKey, String portalBottomCornerLocation, String portalTopCornerLocation, String npcName) { _name = name; @@ -170,6 +170,7 @@ public class ServerGroup _hotbarInventory = hotbarInventory; _hotbarHubClock = hotbarHubClock; _playerKickIdle = playerKickIdle; + _hardMaxPlayerCap = hardMaxPlayerCap; _staffOnly = staffOnly; _whitelist = whitelist; _resourcePack = resourcePack; @@ -224,7 +225,7 @@ public class ServerGroup public boolean getHotbarInventory() { return _hotbarInventory; } public boolean getHotbarHubClock() { return _hotbarHubClock; } public boolean getPlayerKickIdle() { return _playerKickIdle; } - public boolean getGenerateFreeVersions() { return _generateFreeVersions; } + public boolean getHardMaxPlayerCap() { return _hardMaxPlayerCap; } public String getGames() { return _games; } public String getModes() { return _modes; } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index 5de486ec3..aa60c8030 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -263,6 +263,7 @@ public class Arcade extends JavaPlugin config.HotbarInventory = _serverConfiguration.getServerGroup().getHotbarInventory(); config.HotbarHubClock = _serverConfiguration.getServerGroup().getHotbarHubClock(); config.PlayerKickIdle = _serverConfiguration.getServerGroup().getPlayerKickIdle(); + config.HardMaxPlayerCap = _serverConfiguration.getServerGroup().getHardMaxPlayerCap(); config.GameVoting = _serverConfiguration.getServerGroup().getGameVoting(); config.MapVoting = _serverConfiguration.getServerGroup().getMapVoting(); 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 1b111650b..3e58d5bdf 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/ArcadeManager.java @@ -1191,7 +1191,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation { String reason = C.Bold + "Server has reached max capacity for gameplay purposes."; - if (GetGame() == null || GetGame().DontAllowOverfill) + if (_serverConfig.HardMaxPlayerCap) { event.disallow(PlayerLoginEvent.Result.KICK_OTHER, reason); return; @@ -1232,10 +1232,7 @@ public class ArcadeManager extends MiniPlugin implements IRelation public boolean IsAlive(Player player) { - if (_game == null) - return false; - - return _game.IsAlive(player); + return _game != null && _game.IsAlive(player); } /** @@ -1247,7 +1244,6 @@ public class ArcadeManager extends MiniPlugin implements IRelation public boolean hasBeenPlaying(Player player) { return _game != null && _game.GetTeam(player) != null; - } public void Clear(Player player) diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index c0ff0ed4d..59d363645 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -298,8 +298,6 @@ public abstract class Game extends ListenerComponent implements Lifetimed public boolean TeleportsDisqualify = true; - public boolean DontAllowOverfill = false; - public GameMode PlayerGameMode = GameMode.SURVIVAL; // Addons diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java index 78a26a30c..f5584e531 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/GameServerConfig.java @@ -43,7 +43,8 @@ public class GameServerConfig public boolean HotbarHubClock = true; public boolean PlayerKickIdle = true; - + public boolean HardMaxPlayerCap = false; + public boolean PublicServer = true; public boolean PlayerServerWhitelist = false; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java index ff1995b24..13290e0d2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/build/Build.java @@ -225,8 +225,6 @@ public class Build extends Game this.WorldFireSpread = true; this.WorldBoneMeal = true; - this.DontAllowOverfill = true; - this.AnticheatDisabled = true; this.PlayerGameMode = GameMode.CREATIVE; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/CakeWars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/CakeWars.java index ab97dd513..36913b57e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/CakeWars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/cakewars/CakeWars.java @@ -163,7 +163,6 @@ public class CakeWars extends TeamGame ItemPickup = true; GameTimeout = TimeUnit.HOURS.toMillis(1); WorldBoundary = false; - DontAllowOverfill = true; _help = TIPS; registerStatTrackers( diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java index 9d6125a08..c7758d8e9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsCTF.java @@ -63,9 +63,7 @@ public class ChampionsCTF extends CaptureTheFlag InventoryOpenChest = true; EloStart = 1000; - - this.DontAllowOverfill = true; - + this.DisableKillCommand = false; AllowParticles = false; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java index bb8e8a459..2431692cb 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsDominate.java @@ -57,9 +57,7 @@ public class ChampionsDominate extends Domination InventoryOpenChest = true; EloStart = 1000; - - this.DontAllowOverfill = true; - + this.DisableKillCommand = false; registerStatTrackers( diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java index e88cd3a63..01137209f 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/champions/ChampionsTDM.java @@ -55,8 +55,6 @@ public class ChampionsTDM extends TeamDeathmatch InventoryOpenChest = true; this.DisableKillCommand = false; - - this.DontAllowOverfill = true; registerStatTrackers( new KillReasonStatTracker(this, "Backstab", "Assassination", false), diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java index 15475e41d..848c91d02 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/gladiators/Gladiators.java @@ -134,7 +134,6 @@ public class Gladiators extends SoloGame DamageSelf = true; DamageTeamSelf = true; HungerSet = 20; - DontAllowOverfill = true; EnableTutorials = false; BlockBreakAllow.add(Material.SUGAR_CANE_BLOCK.getId()); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java index c6aa6747d..dac9c63a9 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/halloween/Halloween.java @@ -157,8 +157,6 @@ public class Halloween extends SoloGame //this.HungerSet = 20; this.WorldBoundaryKill = false; - - this.DontAllowOverfill = true; registerChatStats( DamageDealt, diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java index 68556119f..5e35d8616 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/minestrike/Minestrike.java @@ -155,8 +155,6 @@ public class Minestrike extends TeamGame this.JoinInProgress = true; - this.DontAllowOverfill = true; - this.AllowEntitySpectate = false; this.AllowParticles = false; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/MobaClassic.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/MobaClassic.java index 853488d6d..946f397ca 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/MobaClassic.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/moba/MobaClassic.java @@ -34,7 +34,6 @@ public class MobaClassic extends Moba { super(manager, GameType.MOBA, DESCRIPTION); - DontAllowOverfill = true; PrepareAutoAnnounce = false; PrepareFreeze = false; PrepareTime = PREPARE_TIME; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/TeamSkyfall.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/TeamSkyfall.java index 8324eb051..98b525106 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/TeamSkyfall.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skyfall/TeamSkyfall.java @@ -38,7 +38,6 @@ public class TeamSkyfall extends Skyfall DamageTeamSelf = false; - DontAllowOverfill = true; ShowTeammateMessage = true; HideTeamSheep = true; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java index 21820395f..bc0bb4d6e 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/Skywars.java @@ -123,8 +123,6 @@ public abstract class Skywars extends Game PlaySoundGameStart = true; PrepareTime = TimeUnit.SECONDS.toMillis(10); - DontAllowOverfill = true; - StrictAntiHack = true; _oreHider = new OreHider(); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java index 555aa16bc..5491020b4 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/skywars/TeamSkywars.java @@ -62,8 +62,6 @@ public class TeamSkywars extends Skywars SpawnNearAllies = true; DamageTeamSelf = false; - - DontAllowOverfill = true; ShowTeammateMessage = true; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java index 0069b7b3c..1527a69a2 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/TeamSuperSmash.java @@ -37,8 +37,6 @@ public class TeamSuperSmash extends SuperSmash SpawnNearAllies = true; DamageTeamSelf = false; - DontAllowOverfill = true; - ShowTeammateMessage = true; _teamSelector = new FillToSelector(this, 2); diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java index 0ce660d41..40d70a5be 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/speedbuilders/SpeedBuilders.java @@ -182,8 +182,6 @@ public class SpeedBuilders extends SoloGame HungerSet = 20; HealthSet = 20; - DontAllowOverfill = true; - DeathMessages = false; FixSpawnFacing = false; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java index 257e2e93d..6f137613c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/survivalgames/SurvivalGamesNewTeams.java @@ -34,8 +34,6 @@ public class SurvivalGamesNewTeams extends SurvivalGamesNew DamageTeamSelf = false; - DontAllowOverfill = true; - _teamSelector = new FillToSelector(this, 2); new NamedTeamsModule() diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java index b2d083bb0..5b1cb0b5c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHC.java @@ -264,8 +264,6 @@ public abstract class UHC extends Game WorldBoneMeal = true; - DontAllowOverfill = true; - GadgetsDisabled = true; AllowParticles = false; diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHCTeams.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHCTeams.java index af6cfb9be..3afbf655d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHCTeams.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/uhc/UHCTeams.java @@ -32,7 +32,6 @@ public class UHCTeams extends UHC super(manager, type, speedMode); DamageTeamSelf = false; - DontAllowOverfill = true; ShowTeammateMessage = true; TeamMode = true;