From a30222bec71f7047a2ba93170cc040e2b8d14a64 Mon Sep 17 00:00:00 2001 From: fernferret Date: Tue, 11 Oct 2011 22:51:30 -0400 Subject: [PATCH] Show whether or not gamemode is being enforced, Fix enum Config Property --- .../onarandombox/MultiverseCore/commands/InfoCommand.java | 6 +++++- .../onarandombox/MultiverseCore/enums/ConfigProperty.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java index 13dc812d..d70c1151 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java +++ b/src/main/java/com/onarandombox/MultiverseCore/commands/InfoCommand.java @@ -102,7 +102,11 @@ public class InfoCommand extends MultiverseCommand { message.add(new FancyHeader("General Info", colors)); message.add(new FancyMessage("World Name: ", world.getName(), colors)); message.add(new FancyMessage("World Alias: ", world.getColoredWorldString(), colors)); - message.add(new FancyMessage("Game Mode: ", world.getGameMode().toString(), colors)); + String enforced = ""; + if(!MultiverseCore.EnforceGameModes) { + enforced = ChatColor.RED + " Not Enforced!"; + } + message.add(new FancyMessage("Game Mode: ", world.getGameMode() + enforced, colors)); //message.add(new FancyMessage("Game Mode: ", StringUtils.capitalize(world.getGameMode().toString()), colors)); Location spawn = world.getSpawnLocation(); message.add(new FancyMessage("Spawn Location: ", LocationManipulation.strCoords(spawn), colors)); diff --git a/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java b/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java index b9cb2d49..4b96a25b 100644 --- a/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java +++ b/src/main/java/com/onarandombox/MultiverseCore/enums/ConfigProperty.java @@ -9,6 +9,6 @@ package com.onarandombox.MultiverseCore.enums; /** Multiverse 2 */ public enum ConfigProperty { - messagecooldown, teleportcooldown, worldnameprefix, useworldaccess, - disableautoheal, fakepvp, bedrespawn, finalsayaccess, debug + messagecooldown, teleportcooldown, worldnameprefix, + disableautoheal, fakepvp, bedrespawn, enforcegamemodes, enforceaccess, debug }