From 144a140db10c09c37ff7babcc153fcb68a67b3cc Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Sat, 6 Feb 2021 10:54:44 +0000
Subject: [PATCH] Fixed questionable bow/trident damage multiplier code

---
 .../effects/effects/BowDamageMultiplier.java  | 22 +++++++--------
 .../effects/TridentDamageMultiplier.java      | 27 +++++++------------
 2 files changed, 18 insertions(+), 31 deletions(-)

diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java
index ca36c94..bf09977 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java
@@ -21,22 +21,18 @@ public class BowDamageMultiplier extends Effect<Double> {
             return;
         }
 
-        Player player = null;
-        if (event.getDamager() instanceof Arrow) {
-            ProjectileSource shooter = ((Projectile) event.getDamager()).getShooter();
-            if (shooter == null) {
-                return;
-            }
-
-            if (shooter instanceof Player) {
-                player = (Player) shooter;
-            }
-        }
-
-        if (player == null) {
+        if (!(event.getDamager() instanceof Arrow)) {
             return;
         }
 
+        ProjectileSource shooter = ((Projectile) event.getDamager()).getShooter();
+
+        if (!(shooter instanceof Player)) {
+            return;
+        }
+
+        Player player = (Player) shooter;
+
         Double multiplier = ArmorUtils.getEffectStrength(player, this);
         if (multiplier == null) {
             return;
diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java
index d0d8451..4703c4b 100644
--- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java
+++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java
@@ -21,32 +21,23 @@ public class TridentDamageMultiplier extends Effect<Double> {
             return;
         }
 
-        Player attacker = null;
-        if (event.getDamager() instanceof Trident) {
-            ProjectileSource shooter = ((Projectile) event.getDamager()).getShooter();
-            if (shooter == null) {
-                return;
-            }
-
-            if (shooter instanceof Player) {
-                attacker = (Player) shooter;
-            }
-        }
-
-        if (attacker == null) {
+        if (!(event.getDamager() instanceof Trident)) {
             return;
         }
 
-        Double multiplier = ArmorUtils.getEffectStrength(attacker, this);
+        ProjectileSource shooter = ((Projectile) event.getDamager()).getShooter();
 
+        if (!(shooter instanceof Player)) {
+            return;
+        }
+
+        Player player = (Player) shooter;
+
+        Double multiplier = ArmorUtils.getEffectStrength(player, this);
         if (multiplier == null) {
             return;
         }
 
-        if (multiplier == 0) {
-            return;
-        }
-
         event.setDamage(event.getDamage() * multiplier);
     }
 }