From e8c8fb7c5758cec6f3a52ad948209262fa4a3208 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Sun, 7 Jul 2024 21:06:41 +0200 Subject: [PATCH] Optimize blocking detection code --- .../midnightdust/swordblocking/SwordBlockingClient.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java index f88a995..0de3fa3 100644 --- a/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java +++ b/src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java @@ -25,10 +25,11 @@ public class SwordBlockingClient implements ClientModInitializer { public static boolean canWeaponBlock(LivingEntity entity) { if (!SwordBlockingConfig.enabled) return false; - Item mainItem = entity.getMainHandStack().getItem(); - Item offItem = entity.getOffHandStack().getItem(); - return ((mainItem instanceof SwordItem || mainItem instanceof AxeItem || mainItem instanceof MaceItem) && offItem instanceof ShieldItem) - || ((offItem instanceof SwordItem || offItem instanceof AxeItem || offItem instanceof MaceItem) && mainItem instanceof ShieldItem); + if (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; + } + return false; } public static boolean isBlockingOnViaVersion(LivingEntity entity) { Item item = entity.getMainHandStack().getItem() instanceof SwordItem ? entity.getMainHandStack().getItem() : entity.getOffHandStack().getItem();