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 questionable bow/trident damage multiplier code

Browse Source
This commit is contained in:
Auxilor
2021-02-06 10:54:44 +00:00
parent 7fb186bb2d
commit 144a140db1
2 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

27
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/effects/effects/TridentDamageMultiplier.java
View File

@@ -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);
}
}