From 7269a026ebccefde9c4095e3a16e420cd7174a9a Mon Sep 17 00:00:00 2001 From: asofold Date: Tue, 17 Apr 2018 12:46:08 +0200 Subject: [PATCH] Remove redundant abstract method. --- .../nocheatplus/penalties/AbstractPenalty.java | 13 ------------- .../penalties/fight/FightPenaltyMultiplyDamage.java | 2 +- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/AbstractPenalty.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/AbstractPenalty.java index 89e3f497..f7a9b218 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/AbstractPenalty.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/AbstractPenalty.java @@ -36,22 +36,9 @@ public abstract class AbstractPenalty implements Penalty { return registeredInput; } - @Override - public boolean apply(final RI input) { - return applyGenericEffects(input); - } - @Override public void addToPenaltyList(final IPenaltyList penaltyList) { penaltyList.addPenalty(registeredInput, this); } - /** - * Override for implementation of input-specific effects. - * - * @param input - * @return See: {@link AbstractPenalty#apply(Object)} - */ - protected abstract boolean applyGenericEffects(RI input); - } diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/fight/FightPenaltyMultiplyDamage.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/fight/FightPenaltyMultiplyDamage.java index 4c772e6e..fb0291e8 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/fight/FightPenaltyMultiplyDamage.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/penalties/fight/FightPenaltyMultiplyDamage.java @@ -34,7 +34,7 @@ public class FightPenaltyMultiplyDamage extends FightPenaltyEntityDamage { } @Override - protected boolean applyGenericEffects(final EntityDamageEvent event) { + public boolean apply(final EntityDamageEvent event) { BridgeHealth.multiplyFinalDamage(event, multiplier); return true; }