From c73fcba252d79387a0428f5065b78600a703393f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1s=20F?= Date: Wed, 1 Jul 2020 20:08:15 +0100 Subject: [PATCH] Use guard clause instead of nested if statememt --- .../tomff/beesplus/handlers/DamageHandler.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/tomff/beesplus/handlers/DamageHandler.java b/src/main/java/com/tomff/beesplus/handlers/DamageHandler.java index 0d6517a..6be39b9 100644 --- a/src/main/java/com/tomff/beesplus/handlers/DamageHandler.java +++ b/src/main/java/com/tomff/beesplus/handlers/DamageHandler.java @@ -41,14 +41,16 @@ public class DamageHandler implements Listener { Player player = (Player) event.getEntity(); PlayerInventory playerInventory = player.getInventory(); - if (Stream.of(playerInventory.getArmorContents()).allMatch(Objects::nonNull)) { - if (playerInventory.getHelmet().isSimilar(helmet.getResult()) && - playerInventory.getChestplate().isSimilar(chestplate.getResult()) && - playerInventory.getLeggings().isSimilar(leggings.getResult()) && - playerInventory.getBoots().isSimilar(boots.getResult())) { + if (!Stream.of(playerInventory.getArmorContents()).allMatch(Objects::nonNull)) { + return; + } - event.setDamage(reduction * event.getDamage()); - } + if (playerInventory.getHelmet().isSimilar(helmet.getResult()) && + playerInventory.getChestplate().isSimilar(chestplate.getResult()) && + playerInventory.getLeggings().isSimilar(leggings.getResult()) && + playerInventory.getBoots().isSimilar(boots.getResult())) { + + event.setDamage(reduction * event.getDamage()); } } }