fix(neo/1.20.4): fix #49

Nova-Committee · Mar 20, 2024 · a9fad1b · a9fad1b
1 parent 51f5f30
commit a9fad1b
Showing 1 changed file with 27 additions and 29 deletions.
diff --git a/src/main/java/committee/nova/mods/avaritia/init/handler/AbilityHandler.java b/src/main/java/committee/nova/mods/avaritia/init/handler/AbilityHandler.java
@@ -56,52 +56,50 @@ public static void updateAbilities(LivingEvent.LivingTickEvent event) {
             boolean hasLeggings = isPlayerWearing(event.getEntity(), LEGS, item -> item instanceof ArmorInfinityItem);
             boolean hasBoots = isPlayerWearing(event.getEntity(), FEET, item -> item instanceof ArmorInfinityItem);
 
-            if (entitiesWithHelmets.contains(key)) {
-                if (hasHelmet) {
+
+            if (hasHelmet) {
+                if (entitiesWithHelmets.contains(key)) {
                     handleHelmetStateChange(entity);
                 } else {
-                    entitiesWithHelmets.remove(key);
+                    entitiesWithHelmets.add(key);
                 }
             } else {
-                entitiesWithHelmets.add(key);
+                entitiesWithHelmets.remove(key);
             }
 
-
-            if (entitiesWithChest.contains(key)) {
-                if (hasChest) {
+            if (hasChest) {
+                if (entitiesWithChest.contains(key)) {
                     handleChestStateChange(entity);
-                } else  {
-                    if (!entity.isCreative() && !entity.isSpectator()){
-                        entity.getAbilities().mayfly = false;
-                        entity.getAbilities().flying = false;
-                    }
-                    entitiesWithChest.remove(key);
+                } else {
+                    entitiesWithChest.add(key);
                 }
-            } else {
-                entitiesWithChest.add(key);
+            } else  {
+                if (!entity.isCreative() && !entity.isSpectator()){
+                    entity.getAbilities().mayfly = false;
+                    entity.getAbilities().flying = false;
+                }
+                entitiesWithChest.remove(key);
             }
 
-
-            if (entitiesWithLeggings.contains(key)) {
-                if (hasLeggings) {
+            if (hasLeggings) {
+                if (entitiesWithLeggings.contains(key)) {
                     handleLeggingsStateChange(entity);
-                } else  {
-                    entitiesWithLeggings.remove(key);
+                } else {
+                    entitiesWithLeggings.add(key);
                 }
             } else {
-                entitiesWithLeggings.add(key);
+                entitiesWithLeggings.remove(key);
             }
 
-
-            if (entitiesWithBoots.contains(key)) {
-                if (hasBoots) {
+            if (hasBoots) {
+                if (entitiesWithBoots.contains(key)) {
                     handleBootsStateChange(entity);
-                } else  {
-                    entity.setMaxUpStep(0.5F);
-                    entitiesWithBoots.remove(key);
+                } else {
+                    entitiesWithBoots.add(key);
                 }
-            } else {
-                entitiesWithBoots.add(key);
+            } else  {
+                entity.setMaxUpStep(0.5F);
+                entitiesWithBoots.remove(key);
             }
 
         }