From df158c416e2c882042c3f68f5671a49a3dc629d8 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Sun, 22 Nov 2020 19:12:09 +1300 Subject: [PATCH] Add ability to have self disguises off by default --- src/main/java/me/libraryaddict/disguise/DisguiseConfig.java | 4 ++++ .../me/libraryaddict/disguise/disguisetypes/Disguise.java | 2 +- src/main/resources/config.yml | 3 +++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java index cb361850..b8fd81b7 100644 --- a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java +++ b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java @@ -268,6 +268,9 @@ public class DisguiseConfig { @Getter @Setter private static int playerDisguisesSkinExpiresMove; + @Getter + @Setter + private static boolean viewSelfDisguisesDefault; public static boolean isArmorstandsName() { return getPlayerNameType() == PlayerNameType.ARMORSTANDS; @@ -716,6 +719,7 @@ public class DisguiseConfig { setRandomDisguises(config.getBoolean("RandomDisguiseOptions")); setSaveUserPreferences(config.getBoolean("SaveUserPreferences")); setPlayerDisguisesSkinExpiresMove(config.getInt("PlayerDisguisesTablistExpiresMove")); + setViewSelfDisguisesDefault(config.getBoolean("ViewSelfDisguisesDefault")); if (!LibsPremium.isPremium() && (isSavePlayerDisguises() || isSaveEntityDisguises())) { DisguiseUtilities.getLogger().warning("You must purchase the plugin to use saved disguises!"); diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java index 24aa8485..fb63c231 100644 --- a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java +++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java @@ -57,7 +57,7 @@ public abstract class Disguise { private boolean replaceSounds = DisguiseConfig.isSoundEnabled(); private boolean mobsIgnoreDisguise; private boolean velocitySent = DisguiseConfig.isVelocitySent(); - private boolean viewSelfDisguise = DisguiseConfig.isViewDisguises(); + private boolean viewSelfDisguise = DisguiseConfig.isViewDisguises() && DisguiseConfig.isViewSelfDisguisesDefault(); @Getter private DisguiseConfig.NotifyBar notifyBar = DisguiseConfig.getNotifyBar(); @Getter diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml index 22e443cf..b0e4fda1 100644 --- a/src/main/resources/config.yml +++ b/src/main/resources/config.yml @@ -135,6 +135,9 @@ UndisguiseRadiusMax: 50 # Shall the players view their disguises? # Best used when viewing yourself in 3rd person ViewSelfDisguises: true +# Are self disguises enabled by default +# Default is true +ViewSelfDisguisesDefault: true # Some disguises are rather big and tall and block your vision # By default those disguises are enabled despite misgivings, such as zombies, players, etc.