From 4e2fa07c154a42f7b8cb680065b092d2f8f04ff9 Mon Sep 17 00:00:00 2001
From: Martin Prokoph <motschen@midnightdust.eu>
Date: Sun, 7 Jul 2024 21:07:51 +0200
Subject: [PATCH] Code cleanup

---
 .../eu/midnightdust/swordblocking/SwordBlockingClient.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
index 0de3fa3..0f1934b 100644
--- a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
+++ b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
@@ -23,9 +23,7 @@ public class SwordBlockingClient implements ClientModInitializer {
     }
 
     public static boolean canWeaponBlock(LivingEntity entity) {
-        if (!SwordBlockingConfig.enabled)
-            return false;
-        if (entity.getOffHandStack().getItem() instanceof ShieldItem || entity.getMainHandStack().getItem() instanceof ShieldItem) {
+        if (SwordBlockingConfig.enabled && (entity.getOffHandStack().getItem() instanceof ShieldItem || entity.getMainHandStack().getItem() instanceof ShieldItem)) {
             Item mainItem = entity.getOffHandStack().getItem() instanceof ShieldItem ? entity.getMainHandStack().getItem() : entity.getOffHandStack().getItem();
             return mainItem instanceof SwordItem || mainItem instanceof AxeItem || mainItem instanceof MaceItem;
         }