Motschen/SwordBlocking
1
0
Fork 0
mirror of https://github.com/TeamMidnightDust/SwordBlocking.git synced 2025-12-15 14:35:10 +01:00
Code Issues Packages Projects Releases Wiki Activity

Optimize blocking detection code

Browse Source
This commit is contained in:
Martin Prokoph
2024-07-07 21:06:41 +02:00
parent 0bbcf5251e
commit e8c8fb7c57
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/eu/midnightdust/swordblocking/SwordBlockingClient.java
View File

@@ -25,10 +25,11 @@ public class SwordBlockingClient implements ClientModInitializer {
public static boolean canWeaponBlock(LivingEntity entity) { public static boolean canWeaponBlock(LivingEntity entity) {
if (!SwordBlockingConfig.enabled) if (!SwordBlockingConfig.enabled)
return false; return false;
Item mainItem = entity.getMainHandStack().getItem(); if (entity.getOffHandStack().getItem() instanceof ShieldItem || entity.getMainHandStack().getItem() instanceof ShieldItem) {
Item offItem = entity.getOffHandStack().getItem(); Item mainItem = entity.getOffHandStack().getItem() instanceof ShieldItem ? entity.getMainHandStack().getItem() : entity.getOffHandStack().getItem();
return ((mainItem instanceof SwordItem || mainItem instanceof AxeItem || mainItem instanceof MaceItem) && offItem instanceof ShieldItem) return mainItem instanceof SwordItem || mainItem instanceof AxeItem || mainItem instanceof MaceItem;
|| ((offItem instanceof SwordItem || offItem instanceof AxeItem || offItem instanceof MaceItem) && mainItem instanceof ShieldItem); }
return false;
} }
public static boolean isBlockingOnViaVersion(LivingEntity entity) { public static boolean isBlockingOnViaVersion(LivingEntity entity) {
Item item = entity.getMainHandStack().getItem() instanceof SwordItem ? entity.getMainHandStack().getItem() : entity.getOffHandStack().getItem(); Item item = entity.getMainHandStack().getItem() instanceof SwordItem ? entity.getMainHandStack().getItem() : entity.getOffHandStack().getItem();