Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-27 14:13:11 +02:00
Code Issues Projects Releases Wiki Activity

Remove not implemented options (fight.critical). (+)

Browse Source 
(+) Preparatory comments.

Something came in between back then, but now it's not efficient to do a
special case here. Instead, generic penalties will be implemented to
some extent.
This commit is contained in:
asofold 2018-04-03 21:37:57 +02:00
parent 43ba77aaa0
commit 588c356632
5 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/IPenaltyList.java
View File

@ -21,6 +21,8 @@ package fr.neatmonster.nocheatplus.actions.types.penalty;
*
*/
public interface IPenaltyList {
// TODO: Typed ? + typed per input getter (mapped lists)
/**
* Add an input-specific penalty.
* @param penalty

1
NCPCore/src/main/java/fr/neatmonster/nocheatplus/actions/types/penalty/InputSpecificPenalty.java
View File

@ -24,6 +24,7 @@ public interface InputSpecificPenalty extends Penalty {
* May be of unexpected type.
* @param registeredInput
*/
// TODO: Typed input (generics)?
// TODO: Consider boolean result for "the input type was accepted", in order to detect if an input is not accepted by any generic penalty.
public void apply(Object input);

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/Critical.java
View File

@ -101,6 +101,8 @@ public class Critical extends Check {
vd.setParameter(ParameterName.TAGS, StringUtil.join(tags, "+"));
}
cancel = executeActions(vd).willCancel();
// TODO: Introduce penalty instead of cancel.
}
auxMoving.returnPlayerMoveInfo(moveInfo);
}

7
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/ConfPaths.java
View File

@ -467,9 +467,6 @@ public abstract class ConfPaths {
private static final String FIGHT_CRITICAL = FIGHT + "critical.";
public static final String FIGHT_CRITICAL_CHECK = FIGHT_CRITICAL + SUB_ACTIVE;
private static final String FIGHT_CRITICAL_CANCEL = FIGHT_CRITICAL + "cancel.";
public static final String FIGHT_CRITICAL_CANCEL_CANCEL = FIGHT_CRITICAL_CANCEL + "cancel";
public static final String FIGHT_CRITICAL_CANCEL_DIVIDEDAMAGE = FIGHT_CRITICAL_CANCEL + "dividedamage";
// TODO: Deprecate or rename (->falldistancemin)?
public static final String FIGHT_CRITICAL_FALLDISTANCE = FIGHT_CRITICAL + "falldistance";
public static final String FIGHT_CRITICAL_ACTIONS = FIGHT_CRITICAL + "actions";
@ -896,6 +893,10 @@ public abstract class ConfPaths {
public static final String MOVING_SURVIVALFLY_VLFREEZE = "checks.moving.survivalfly.vlfreeze";
@Deprecated
public static final String MOVING_SURVIVALFLY_LENIENCY_FREEZETIME = "checks.moving.survivalfly.leniency.freezetime";
@Deprecated
public static final String FIGHT_CRITICAL_CANCEL_CANCEL = "checks.fight.critical.cancel.cancel";
@Deprecated
public static final String FIGHT_CRITICAL_CANCEL_DIVIDEDAMAGE = "checks.fight.critical.cancel.dividedamage";
/**
* Get moved paths for which an annotation doesn't work.

2
NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java
View File

@ -330,8 +330,6 @@ public class DefaultConfig extends ConfigFile {
set(ConfPaths.FIGHT_ANGLE_ACTIONS, "cancel vl>100 log:angle:3:5:f cancel vl>250 log:angle:0:5:cif cancel", 785);
set(ConfPaths.FIGHT_CRITICAL_CHECK, "default", 785);
set(ConfPaths.FIGHT_CRITICAL_CANCEL_CANCEL, 100, 785);
set(ConfPaths.FIGHT_CRITICAL_CANCEL_DIVIDEDAMAGE, 1.5, 785);
set(ConfPaths.FIGHT_CRITICAL_FALLDISTANCE, 0.06251, 785);
set(ConfPaths.FIGHT_CRITICAL_ACTIONS, "cancel vl>50 log:critical:0:5:cif cancel", 785);