diff --git a/Plugins[Modified]/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java b/Plugins[Modified]/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java index 45913ae9..f511f7b1 100644 --- a/Plugins[Modified]/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java +++ b/Plugins[Modified]/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java @@ -188,7 +188,7 @@ public class WorldData TimingManager.stop("UnzipWorld creating folders"); TimingManager.start("UnzipWorld UnzipToDirectory"); - ZipUtil.UnzipToDirectory("../../update/maps/Clans/Raids/" + RaidName + "/" + getFile() + ".zip", folder); + ZipUtil.UnzipToDirectory("update/maps/Clans/Raids/" + RaidName + "/" + getFile() + ".zip", folder); TimingManager.stop("UnzipWorld UnzipToDirectory"); } diff --git a/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java b/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java index 440e875a..ca441a75 100644 --- a/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java +++ b/Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java @@ -92,7 +92,7 @@ public class ServerGroup _tournament = Boolean.valueOf(data.get("tournament")); _tournamentPoints = Boolean.valueOf(data.get("tournamentPoints")); _hardMaxPlayerCap = Boolean.valueOf(data.get("hardMaxPlayerCap")); - _games = data.get("games"); + _games = data.getOrDefault("games", "Smash"); _modes = data.get("modes"); _boosterGroup = data.get("boosterGroup"); _serverType = data.getOrDefault("serverType", "dedicated"); diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java index 17445216..3efd22e5 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java @@ -219,6 +219,8 @@ public class Arcade extends JavaPlugin //Updates require(Updater.class); + + MinecraftServer.getServer().getPropertyManager().setProperty("debug", false); SpigotConfig.debug = false; } diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java index 72170983..b4095c01 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java @@ -479,6 +479,8 @@ public abstract class Game extends ListenerComponent implements Lifetimed _teamModule = new GameTeamModule(); _teamModule.register(this); + /* + registerDebugCommand("kit", Perm.DEBUG_COMMANDS, PermissionGroup.ADMIN, (caller, args) -> { String kit = Arrays.stream(args).collect(Collectors.joining(" ")); @@ -504,6 +506,7 @@ public abstract class Game extends ListenerComponent implements Lifetimed Announce(C.cWhiteB + caller.getName() + C.cAquaB + " reset cooldowns!"); }); + */ } // You should never use this so please don't. Use Module.register instead diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java index 4813b010..444574f2 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java @@ -314,6 +314,7 @@ public class GameHostManager implements Listener _host = event.getPlayer(); _hostRank = Manager.GetClients().Get(_host).getPrimaryGroup(); System.out.println("Game Host Joined."); + giveAdminItem(event.getPlayer()); //Limit player count! if (Manager.GetServerConfig().MaxPlayers > getMaxPlayerCap()) @@ -430,9 +431,6 @@ public class GameHostManager implements Listener private void giveAdminItem(Player player) { - if (Manager.GetGame() == null) - return; - if (UtilGear.isMat(player.getInventory().getItem(8), Material.SPECKLED_MELON)) return; diff --git a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java index 7cc5972a..da26cd5d 100644 --- a/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java +++ b/Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java @@ -177,7 +177,7 @@ public class WorldData TimingManager.stop("UnzipWorld creating folders"); TimingManager.start("UnzipWorld UnzipToDirectory"); - ZipUtil.UnzipToDirectory("../../update/maps/" + Game.getName() + "/" + GetFile() + ".zip", folder); + ZipUtil.UnzipToDirectory("update/maps/" + Game.getName() + "/" + GetFile() + ".zip", folder); TimingManager.stop("UnzipWorld UnzipToDirectory"); }