From 70d9fba0afffcc291e6d81018f36eb9939266487 Mon Sep 17 00:00:00 2001 From: Auxilor Date: Fri, 5 Feb 2021 22:37:09 +0000 Subject: [PATCH] Fixed various shit --- .../java/com/willfp/ecoarmor/display/ArmorDisplay.java | 6 ------ .../ecoarmor/effects/effects/BowDamageMultiplier.java | 8 ++++---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java index 106470f..6abe0c5 100644 --- a/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java +++ b/eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java @@ -1,6 +1,5 @@ package com.willfp.ecoarmor.display; -import com.willfp.ecoarmor.EcoArmorPlugin; import com.willfp.ecoarmor.config.EcoArmorConfigs; import com.willfp.ecoarmor.proxy.proxies.SkullProxy; import com.willfp.ecoarmor.sets.ArmorSet; @@ -20,11 +19,6 @@ import java.util.List; @UtilityClass public class ArmorDisplay { - /** - * Instance of EcoArmor. - */ - private static final EcoArmorPlugin PLUGIN = EcoArmorPlugin.getInstance(); - /** * The prefix for all EcoArmor lines to have in lore. */ 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 fa5a854..ca36c94 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,7 +21,7 @@ public class BowDamageMultiplier extends Effect { return; } - Player attacker = null; + Player player = null; if (event.getDamager() instanceof Arrow) { ProjectileSource shooter = ((Projectile) event.getDamager()).getShooter(); if (shooter == null) { @@ -29,15 +29,15 @@ public class BowDamageMultiplier extends Effect { } if (shooter instanceof Player) { - attacker = (Player) shooter; + player = (Player) shooter; } } - if (attacker == null) { + if (player == null) { return; } - Double multiplier = ArmorUtils.getEffectStrength(attacker, this); + Double multiplier = ArmorUtils.getEffectStrength(player, this); if (multiplier == null) { return; }