diff --git a/src/engine/gameManager/ConfigManager.java b/src/engine/gameManager/ConfigManager.java index 7541a4e1..ae7f3302 100644 --- a/src/engine/gameManager/ConfigManager.java +++ b/src/engine/gameManager/ConfigManager.java @@ -65,6 +65,7 @@ public enum ConfigManager { MB_WORLD_MAINTENANCE, MB_WORLD_GREETING, MB_WORLD_KEYCLONE_MAX, + MB_WORLD_TESTMODE, MB_USE_RUINS, // Mobile AI modifiers diff --git a/src/engine/gameManager/DevCmdManager.java b/src/engine/gameManager/DevCmdManager.java index 7ba967bf..1590590b 100644 --- a/src/engine/gameManager/DevCmdManager.java +++ b/src/engine/gameManager/DevCmdManager.java @@ -180,18 +180,20 @@ public enum DevCmdManager { //kill any commands not available to everyone on production server //only admin level can run dev commands on production boolean playerAllowed = false; - switch(adc.getMainCmdString()){ - case "printresists": - case "printstats": - case "printskills": - case "printpowers": - case "gimme": - case "goto": - case"teleportmode": - playerAllowed = true; - if(!a.status.equals(Enum.AccountStatus.ADMIN)) - target = pcSender; - break; + if(ConfigManager.MB_WORLD_TESTMODE.getValue().equals("true")) { + switch (adc.getMainCmdString()) { + case "printresists": + case "printstats": + case "printskills": + case "printpowers": + case "gimme": + case "goto": + case "teleportmode": + playerAllowed = true; + if (!a.status.equals(Enum.AccountStatus.ADMIN)) + target = pcSender; + break; + } } if (!playerAllowed && !a.status.equals(Enum.AccountStatus.ADMIN)) { Logger.info("Account " + a.getUname() + "attempted to use dev command " + cmd); diff --git a/src/engine/objects/PlayerCharacter.java b/src/engine/objects/PlayerCharacter.java index 7dd9ad9e..aafe3a16 100644 --- a/src/engine/objects/PlayerCharacter.java +++ b/src/engine/objects/PlayerCharacter.java @@ -4895,6 +4895,9 @@ public class PlayerCharacter extends AbstractCharacter { } public static boolean checkIfBoxed(PlayerCharacter player){ + if(ConfigManager.MB_WORLD_TESTMODE.getValue().equals("true")) { + return false; + } try { String machineID = player.getClientConnection().machineID; ArrayList sameMachine = new ArrayList<>();