From 61128dd3723442b6096569f8e58287c4b901b26f Mon Sep 17 00:00:00 2001
From: libraryaddict <github@lib.co.nz>
Date: Mon, 11 May 2020 03:48:34 +1200
Subject: [PATCH] Rename tall disguises config option to reset it, was bugged
 and no one liked default option

---
 src/main/java/me/libraryaddict/disguise/DisguiseConfig.java  | 4 ++--
 .../me/libraryaddict/disguise/disguisetypes/Disguise.java    | 4 ++--
 src/main/resources/config.yml                                | 5 ++---
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
index 9e8b802d..82a2e4d6 100644
--- a/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
+++ b/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java
@@ -239,7 +239,7 @@ public class DisguiseConfig {
     private static BukkitTask updaterTask;
     @Getter
     @Setter
-    private static boolean hideTallSelfDisguises;
+    private static boolean tallSelfDisguises;
     @Getter
     @Setter
     private static PlayerNameType playerNameType = PlayerNameType.TEAMS;
@@ -647,7 +647,7 @@ public class DisguiseConfig {
         setWolfDyeable(config.getBoolean("DyeableWolf"));
         setTablistRemoveDelay(config.getInt("TablistRemoveDelay"));
         setAutoUpdate(config.getBoolean("AutoUpdate"));
-        setHideTallSelfDisguises(config.getBoolean("HideTallSelfDisguises"));
+        setTallSelfDisguises(config.getBoolean("TallSelfDisguises"));
         setOverrideCustomNames(config.getBoolean("OverrideCustomNames"));
 
         if (!LibsPremium.isPremium() && (isSavePlayerDisguises() || isSaveEntityDisguises())) {
diff --git a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
index 7fbbac0e..a0b9d8e8 100644
--- a/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
+++ b/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java
@@ -99,7 +99,7 @@ public abstract class Disguise {
     private boolean customDisguiseName = true;
     @Getter
     @Setter
-    private boolean tallDisguisesVisible = !DisguiseConfig.isHideTallSelfDisguises();
+    private boolean tallDisguisesVisible = DisguiseConfig.isTallSelfDisguises();
     private String[] multiName = new String[0];
     private transient int[] armorstandIds = new int[0];
 
@@ -608,7 +608,7 @@ public abstract class Disguise {
             setupWatcher();
         }
 
-        if (getEntity() instanceof Player && isSelfDisguiseVisible() && isTallDisguisesVisible() &&
+        if (getEntity() instanceof Player && isSelfDisguiseVisible() && !isTallDisguisesVisible() &&
                 !getType().isCustom()) {
             DisguiseValues values = DisguiseValues.getDisguiseValues(getType());
 
diff --git a/src/main/resources/config.yml b/src/main/resources/config.yml
index ff6aed87..3464459f 100644
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -43,7 +43,6 @@ UpdateConfig: true
 # Useful if you didn't purchase the plugin.
 DisableCommands: false
 
-# The disguise plugin stores all GameProfiles inside a folder called "GameProfiles" as a local cache
 # This means that the plugin doesn't need to constantly call Mojang just to find a skin for an offline player
 # However some people may prefer to disable this.
 # Even if you disable this, if there was disguises in the cache already then it will use them
@@ -128,9 +127,9 @@ UndisguiseRadiusMax: 50
 # Best used when viewing yourself in 3rd person
 ViewSelfDisguises: true
 # Some disguises are rather big and tall and block your vision
-# By default those disguises are disabled, such as zombies, players, etc.
+# By default those disguises are enabled despite misgivings, such as zombies, players, etc.
 # The baby versions however, should be short enough that it's a non-issue
-HideTallSelfDisguises: false
+TallSelfDisguises: true
 
 # Shall I disguise the sounds?
 # This turns your damage sound into a MOOOO