Merge if statements

BentoBoxWorld · Oct 11, 2020 · d72cc11 · d72cc11
1 parent bba5338
commit d72cc11
Showing 1 changed file with 13 additions and 24 deletions.
diff --git a/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java b/src/main/java/world/bentobox/acidisland/listeners/AcidEffect.java
@@ -291,35 +291,24 @@ public static double getDamageReduced(LivingEntity le) {
         ItemStack helmet = inv.getHelmet();
         ItemStack chest = inv.getChestplate();
         ItemStack pants = inv.getLeggings();
-        if (helmet != null) {
-            // Damage if helmet
-            if (helmet.getType().name().contains("HELMET") && damage(helmet)) {
-                le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
-                inv.setHelmet(null);
-            }
+        // Damage if helmet
+        if (helmet != null&& helmet.getType().name().contains("HELMET") && damage(helmet)) {
+            le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
+            inv.setHelmet(null);
         }
-        if (boots != null) {
-            // Damage
-            if (damage(boots)) {
-                le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
-                inv.setBoots(null);
-            }
+        if (boots != null && damage(boots)) {
+            le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
+            inv.setBoots(null);
         }
         // Pants
-        if (pants != null) {
-            // Damage
-            if (damage(pants)) {
-                le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
-                inv.setLeggings(null);
-            }
+        if (pants != null && damage(pants)) {
+            le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
+            inv.setLeggings(null);
         }
         // Chest plate
-        if (chest != null) {
-            // Damage
-            if (damage(chest)) {
-                le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
-                inv.setChestplate(null);
-            }
+        if (chest != null && damage(chest)) {
+            le.getWorld().playSound(le.getLocation(), Sound.ENTITY_ITEM_BREAK, 1F, 1F);
+            inv.setChestplate(null);
         }
         return red;
     }