Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-27 10:59:22 +00:00
Code Issues Releases 1 Activity

Fixed various shit

Browse Source
This commit is contained in:
Auxilor
2021-02-05 22:37:09 +00:00
parent 4271289c4a
commit 70d9fba0af
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/display/ArmorDisplay.java
View File

@@ -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.
*/

8
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/BowDamageMultiplier.java
View File

@@ -21,7 +21,7 @@ public class BowDamageMultiplier extends Effect<Double> {
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<Double> {
}
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;
}