diff --git a/src/main/java/net/citizensnpcs/Citizens.java b/src/main/java/net/citizensnpcs/Citizens.java index e9e541627..5358f136b 100644 --- a/src/main/java/net/citizensnpcs/Citizens.java +++ b/src/main/java/net/citizensnpcs/Citizens.java @@ -180,7 +180,7 @@ public class Citizens extends JavaPlugin implements CitizensPlugin { // Disable if the server is not using the compatible Minecraft version String mcVersion = Util.getMinecraftVersion(); compatible = mcVersion.startsWith(COMPATIBLE_MC_VERSION); - if (!compatible) { + if (Setting.CHECK_MINECRAFT_VERSION.asBoolean() && !compatible) { Messaging.severeTr(Messages.CITIZENS_INCOMPATIBLE, getDescription().getVersion(), mcVersion); getServer().getPluginManager().disablePlugin(this); return; diff --git a/src/main/java/net/citizensnpcs/Settings.java b/src/main/java/net/citizensnpcs/Settings.java index 6ae68a89d..65c82b193 100644 --- a/src/main/java/net/citizensnpcs/Settings.java +++ b/src/main/java/net/citizensnpcs/Settings.java @@ -31,11 +31,6 @@ public class Settings { save(); } - private void updateMessagingSettings() { - Messaging.configure(Setting.DEBUG_MODE.asBoolean(), Setting.MESSAGE_COLOUR.asString(), - Setting.HIGHLIGHT_COLOUR.asString()); - } - public void reload() { config.load(); for (Setting setting : Setting.values()) @@ -50,6 +45,11 @@ public class Settings { config.save(); } + private void updateMessagingSettings() { + Messaging.configure(Setting.DEBUG_MODE.asBoolean(), Setting.MESSAGE_COLOUR.asString(), + Setting.HIGHLIGHT_COLOUR.asString()); + } + public enum Setting { CHAT_BYSTANDERS_HEAR_TARGETED_CHAT("npc.chat.options.bystanders-hear-targeted-chat", true), CHAT_FORMAT("npc.chat.format.no-targets", "[]: "), @@ -61,6 +61,7 @@ public class Settings { CHAT_MULTIPLE_TARGETS_FORMAT("npc.chat.options.multiple-targets-format", "|, | & | & others"), CHAT_RANGE("npc.chat.options.range", 5), + CHECK_MINECRAFT_VERSION("advanced.check-minecraft-version", true), DATABASE_DRIVER("storage.database.driver", ""), DATABASE_PASSWORD("storage.database.password", ""), DATABASE_URL("storage.database.url", ""), diff --git a/src/main/java/net/citizensnpcs/util/Util.java b/src/main/java/net/citizensnpcs/util/Util.java index 73fb740d7..77fc3ed59 100644 --- a/src/main/java/net/citizensnpcs/util/Util.java +++ b/src/main/java/net/citizensnpcs/util/Util.java @@ -26,10 +26,10 @@ public class Util { private static final Location AT_LOCATION = new Location(null, 0, 0, 0); private static final Location FROM_LOCATION = new Location(null, 0, 0, 0); - private static Constructor SEED_GENERATOR_CONSTRUCTOR = null; - private static Constructor RNG_CONSTRUCTOR = null; + private static Constructor SEED_GENERATOR_CONSTRUCTOR = null; + public static void assumePose(LivingEntity entity, float yaw, float pitch) { NMS.look(entity, yaw, pitch); }