Fascinated/mineplex-crepe
1
0
Fork 0
Code Activity

admin item, fallback servergroup game

Browse Source
This commit is contained in:
labalityowo
2023-05-20 14:45:14 +07:00
parent 4822d26372
commit 3718febef3
6 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins[Modified]/Mineplex.Game.Clans/src/mineplex/game/clans/clans/worldevent/raid/WorldData.java
View File

@ -188,7 +188,7 @@ public class WorldData
TimingManager.stop("UnzipWorld creating folders"); TimingManager.stop("UnzipWorld creating folders");
TimingManager.start("UnzipWorld UnzipToDirectory"); 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"); TimingManager.stop("UnzipWorld UnzipToDirectory");
} }

2
Plugins[Modified]/Mineplex.ServerData/src/mineplex/serverdata/data/ServerGroup.java
View File

@ -92,7 +92,7 @@ public class ServerGroup
_tournament = Boolean.valueOf(data.get("tournament")); _tournament = Boolean.valueOf(data.get("tournament"));
_tournamentPoints = Boolean.valueOf(data.get("tournamentPoints")); _tournamentPoints = Boolean.valueOf(data.get("tournamentPoints"));
_hardMaxPlayerCap = Boolean.valueOf(data.get("hardMaxPlayerCap")); _hardMaxPlayerCap = Boolean.valueOf(data.get("hardMaxPlayerCap"));
_games = data.get("games"); _games = data.getOrDefault("games", "Smash");
_modes = data.get("modes"); _modes = data.get("modes");
_boosterGroup = data.get("boosterGroup"); _boosterGroup = data.get("boosterGroup");
_serverType = data.getOrDefault("serverType", "dedicated"); _serverType = data.getOrDefault("serverType", "dedicated");

2
Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/Arcade.java
View File

@ -219,6 +219,8 @@ public class Arcade extends JavaPlugin
//Updates //Updates
require(Updater.class); require(Updater.class);
MinecraftServer.getServer().getPropertyManager().setProperty("debug", false); MinecraftServer.getServer().getPropertyManager().setProperty("debug", false);
SpigotConfig.debug = false; SpigotConfig.debug = false;
} }

3
Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/Game.java
View File

@ -479,6 +479,8 @@ public abstract class Game extends ListenerComponent implements Lifetimed
_teamModule = new GameTeamModule(); _teamModule = new GameTeamModule();
_teamModule.register(this); _teamModule.register(this);
/*
registerDebugCommand("kit", Perm.DEBUG_COMMANDS, PermissionGroup.ADMIN, (caller, args) -> registerDebugCommand("kit", Perm.DEBUG_COMMANDS, PermissionGroup.ADMIN, (caller, args) ->
{ {
String kit = Arrays.stream(args).collect(Collectors.joining(" ")); 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!"); Announce(C.cWhiteB + caller.getName() + C.cAquaB + " reset cooldowns!");
}); });
*/
} }
// You should never use this so please don't. Use Module.register instead // You should never use this so please don't. Use Module.register instead

4
Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/managers/GameHostManager.java
View File

@ -314,6 +314,7 @@ public class GameHostManager implements Listener
_host = event.getPlayer(); _host = event.getPlayer();
_hostRank = Manager.GetClients().Get(_host).getPrimaryGroup(); _hostRank = Manager.GetClients().Get(_host).getPrimaryGroup();
System.out.println("Game Host Joined."); System.out.println("Game Host Joined.");
giveAdminItem(event.getPlayer());
//Limit player count! //Limit player count!
if (Manager.GetServerConfig().MaxPlayers > getMaxPlayerCap()) if (Manager.GetServerConfig().MaxPlayers > getMaxPlayerCap())
@ -430,9 +431,6 @@ public class GameHostManager implements Listener
private void giveAdminItem(Player player) private void giveAdminItem(Player player)
{ {
if (Manager.GetGame() == null)
return;
if (UtilGear.isMat(player.getInventory().getItem(8), Material.SPECKLED_MELON)) if (UtilGear.isMat(player.getInventory().getItem(8), Material.SPECKLED_MELON))
return; return;

2
Plugins[Modified]/Nautilus.Game.Arcade/src/nautilus/game/arcade/world/WorldData.java
View File

@ -177,7 +177,7 @@ public class WorldData
TimingManager.stop("UnzipWorld creating folders"); TimingManager.stop("UnzipWorld creating folders");
TimingManager.start("UnzipWorld UnzipToDirectory"); 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"); TimingManager.stop("UnzipWorld UnzipToDirectory");
} }