From 9370c7ce7b28ab766a3e4d6c97478456b251d9cf Mon Sep 17 00:00:00 2001
From: DoKM <mcazzyman@gmail.com>
Date: Wed, 4 Aug 2021 16:43:51 +0200
Subject: remove left overs from negative cape hotfix

---
 .../moulberry/notenoughupdates/cosmetics/CapeManager.java    | 12 +++---------
 .../github/moulberry/notenoughupdates/options/NEUConfig.java |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/main/java/io')

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java b/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
index 44958889..583e3715 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/cosmetics/CapeManager.java
@@ -205,9 +205,7 @@ public class CapeManager {
             if(none) {
                 localCape = null;
             } else {
-                if (!NotEnoughUpdates.INSTANCE.config.hidden.disableAllCapes) {
-                    localCape = new MutablePair<>(new NEUCape(capename), capename);
-                }
+                localCape = new MutablePair<>(new NEUCape(capename), capename);
             }
         } else if(capeMap.containsKey(playerUUID)) {
             if(none) {
@@ -217,9 +215,7 @@ public class CapeManager {
                 capePair.setValue(capename);
             }
         } else if(!none) {
-            if (!NotEnoughUpdates.INSTANCE.config.hidden.disableAllCapes){
-                capeMap.put(playerUUID, new MutablePair<>(new NEUCape(capename), capename));
-            }
+            capeMap.put(playerUUID, new MutablePair<>(new NEUCape(capename), capename));
         }
     }
 
@@ -293,9 +289,7 @@ public class CapeManager {
                 String selCape = NotEnoughUpdates.INSTANCE.config.hidden.selectedCape;
                 if(selCape != null && !selCape.isEmpty()) {
                     if(localCape == null) {
-                        if (!NotEnoughUpdates.INSTANCE.config.hidden.disableAllCapes) {
-                            localCape = new MutablePair<>(new NEUCape(selCape), selCape);
-                        }
+                        localCape = new MutablePair<>(new NEUCape(selCape), selCape);
                     } else {
                         localCape.setValue(selCape);
                     }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
index 0266772c..543d5bdd 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/options/NEUConfig.java
@@ -291,7 +291,7 @@ public class NEUConfig extends Config {
 
         //These config options were added due to a graphical bug that caused the player to be unable to see the screen
         @Expose public boolean disableBrokenCapes = false;
-        @Expose public boolean disableAllCapes = false;
+
     }
 
     private static ArrayList<String> createDefaultQuickCommands() {
-- 
cgit