Move logic and simplify

Archy-X · Dec 14, 2024 · ffb174d · ffb174d
1 parent 0994b32
commit ffb174d
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/source/DamageLeveler.java b/bukkit/src/main/java/dev/aurelium/auraskills/bukkit/source/DamageLeveler.java
@@ -63,7 +63,6 @@ public void onDamage(EntityDamageEvent event) {
             // Check shield blocking option
             if (skill.equals(Skills.DEFENSE)
                     && !Skills.DEFENSE.optionBoolean("allow_shield_blocking", false)
-                    && player.isBlocking()
                     && isShieldingSuccessful(entityEvent.getDamager(), player)) {
                 return;
             }
@@ -205,14 +204,13 @@ private boolean projectileSourceMatches(ProjectileSource projectileSource, Strin
 
     private boolean isShieldingSuccessful(Entity source, Player subject) {
 
-        boolean flag = false;
         if (source instanceof AbstractArrow entityarrow) {
             if (entityarrow.getPierceLevel() > 0) {
-                flag = true;
+                return false;
             }
         }
 
-        if (flag) {
+        if (!subject.isBlocking()) {
             return false;
         }