mirror of
https://github.com/NoCheatPlus/NoCheatPlus.git
synced 2024-06-26 06:14:42 +02:00
Lessen repetition of violation with false positives for FastConsume.
This commit is contained in:
asofold
parent
953af13405
commit
705170f80c
|
|
@ -28,99 +28,108 @@ import fr.neatmonster.nocheatplus.utilities.TickTask;
|
|||
*
|
||||
*/
|
||||
public class FastConsume extends Check implements Listener{
|
||||
|
||||
|
||||
|
||||
public static void testAvailability(){
|
||||
if (!PlayerItemConsumeEvent.class.getSimpleName().equals("PlayerItemConsumeEvent")){
|
||||
throw new RuntimeException("This exception should not even get thrown.");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static void testAvailability(){
|
||||
if (!PlayerItemConsumeEvent.class.getSimpleName().equals("PlayerItemConsumeEvent")){
|
||||
throw new RuntimeException("This exception should not even get thrown.");
|
||||
}
|
||||
}
|
||||
|
||||
private final Counters counters = NCPAPIProvider.getNoCheatPlusAPI().getGenericInstance(Counters.class);
|
||||
private final int idCancelDead = counters.registerKey("canceldead");
|
||||
|
||||
public FastConsume() {
|
||||
super(CheckType.INVENTORY_FASTCONSUME);
|
||||
// Overrides the instant-eat check.
|
||||
ConfigManager.setForAllConfigs(ConfPaths.INVENTORY_INSTANTEAT_CHECK, false);
|
||||
StaticLog.logInfo("[NoCheatPlus] Inventory checks: FastConsume is available, disabled InstantEat.");
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
|
||||
public void onItemConsume(final PlayerItemConsumeEvent event){
|
||||
final Player player = event.getPlayer();
|
||||
if (player.isDead() && BridgeHealth.getHealth(player) <= 0.0) {
|
||||
// Eat after death.
|
||||
event.setCancelled(true);
|
||||
counters.addPrimaryThread(idCancelDead, 1);
|
||||
return;
|
||||
}
|
||||
if (!isEnabled(player)) {
|
||||
return;
|
||||
}
|
||||
final InventoryData data = InventoryData.getData(player);
|
||||
final long time = System.currentTimeMillis();
|
||||
if (check(player, event.getItem(), time, data)){
|
||||
event.setCancelled(true);
|
||||
DataManager.getPlayerData(player.getName(), true).task.updateInventory();
|
||||
}
|
||||
data.instantEatInteract = time;
|
||||
data.instantEatFood = null;
|
||||
}
|
||||
|
||||
private boolean check(final Player player, final ItemStack stack, final long time, final InventoryData data){
|
||||
// Uses the instant-eat data for convenience.
|
||||
// Consistency checks...
|
||||
if (stack == null){ // || stack.getType() != data.instantEatFood){
|
||||
// TODO: Strict version should prevent other material (?).
|
||||
return false;
|
||||
}
|
||||
final long ref = data.instantEatInteract == 0 ? 0 : Math.max(data.instantEatInteract, data.lastClickTime);
|
||||
if (time < ref){
|
||||
// Time ran backwards.
|
||||
data.instantEatInteract = data.lastClickTime = time;
|
||||
return false;
|
||||
}
|
||||
// Check exceptions.
|
||||
final InventoryConfig cc = InventoryConfig.getConfig(player);
|
||||
final Material mat = stack == null ? null : stack.getType();
|
||||
if (mat != null){
|
||||
if (cc.fastConsumeWhitelist){
|
||||
if (!cc.fastConsumeItems.contains(mat)){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (cc.fastConsumeItems.contains(mat)){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// Actually check.
|
||||
final long timeSpent = ref == 0 ? 0 : (time - ref); // Not interact = instant.
|
||||
final long expectedDuration = cc.fastConsumeDuration;
|
||||
if (timeSpent < expectedDuration){
|
||||
// TODO: Might have to do a specialized check for lag spikes here instead.
|
||||
final float lag = TickTask.getLag(expectedDuration, true);
|
||||
if (timeSpent * lag < expectedDuration){
|
||||
final double difference = (expectedDuration - timeSpent * lag) / 100.0;
|
||||
data.instantEatVL += difference;
|
||||
final ViolationData vd = new ViolationData(this, player, data.instantEatVL, difference, cc.fastConsumeActions);
|
||||
vd.setParameter(ParameterName.FOOD, "" + mat);
|
||||
if (data.instantEatFood != mat){
|
||||
vd.setParameter(ParameterName.TAGS, "inconsistent(" + data.instantEatFood + ")");
|
||||
}
|
||||
else{
|
||||
vd.setParameter(ParameterName.TAGS, "");
|
||||
}
|
||||
if (executeActions(vd)){
|
||||
return true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
data.instantEatVL *= 0.6;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public FastConsume() {
|
||||
super(CheckType.INVENTORY_FASTCONSUME);
|
||||
// Overrides the instant-eat check.
|
||||
ConfigManager.setForAllConfigs(ConfPaths.INVENTORY_INSTANTEAT_CHECK, false);
|
||||
StaticLog.logInfo("[NoCheatPlus] Inventory checks: FastConsume is available, disabled InstantEat.");
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
|
||||
public void onItemConsume(final PlayerItemConsumeEvent event){
|
||||
final Player player = event.getPlayer();
|
||||
if (player.isDead() && BridgeHealth.getHealth(player) <= 0.0) {
|
||||
// Eat after death.
|
||||
event.setCancelled(true);
|
||||
counters.addPrimaryThread(idCancelDead, 1);
|
||||
return;
|
||||
}
|
||||
if (!isEnabled(player)) {
|
||||
return;
|
||||
}
|
||||
final InventoryData data = InventoryData.getData(player);
|
||||
final long time = System.currentTimeMillis();
|
||||
if (check(player, event.getItem(), time, data)){
|
||||
event.setCancelled(true);
|
||||
DataManager.getPlayerData(player.getName(), true).task.updateInventory();
|
||||
}
|
||||
}
|
||||
|
||||
private boolean check(final Player player, final ItemStack stack, final long time, final InventoryData data){
|
||||
// Uses the instant-eat data for convenience.
|
||||
// Consistency checks...
|
||||
if (stack == null){ // || stack.getType() != data.instantEatFood){
|
||||
// TODO: Strict version should prevent other material (?).
|
||||
return false;
|
||||
}
|
||||
final long ref = data.instantEatInteract == 0 ? 0 : Math.max(data.instantEatInteract, data.lastClickTime);
|
||||
if (time < ref){
|
||||
// Time ran backwards.
|
||||
data.instantEatInteract = data.lastClickTime = time;
|
||||
return false;
|
||||
}
|
||||
// Check exceptions.
|
||||
final InventoryConfig cc = InventoryConfig.getConfig(player);
|
||||
final Material mat = stack == null ? null : stack.getType();
|
||||
if (mat != null){
|
||||
if (cc.fastConsumeWhitelist){
|
||||
if (!cc.fastConsumeItems.contains(mat)){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
else if (cc.fastConsumeItems.contains(mat)){
|
||||
return false;
|
||||
}
|
||||
}
|
||||
// Actually check.
|
||||
final long timeSpent = ref == 0 ? 0 : (time - ref); // Not interact = instant.
|
||||
final long expectedDuration = cc.fastConsumeDuration;
|
||||
boolean cancel = false;
|
||||
if (timeSpent < expectedDuration){
|
||||
// TODO: Might have to do a specialized check for lag spikes here instead.
|
||||
final float lag = TickTask.getLag(expectedDuration, true);
|
||||
if (timeSpent * lag < expectedDuration){
|
||||
final double difference = (expectedDuration - timeSpent * lag) / 100.0;
|
||||
data.instantEatVL += difference;
|
||||
final ViolationData vd = new ViolationData(this, player, data.instantEatVL, difference, cc.fastConsumeActions);
|
||||
vd.setParameter(ParameterName.FOOD, "" + mat);
|
||||
if (data.instantEatFood != mat){
|
||||
vd.setParameter(ParameterName.TAGS, "inconsistent(" + data.instantEatFood + ")");
|
||||
}
|
||||
else{
|
||||
vd.setParameter(ParameterName.TAGS, "");
|
||||
}
|
||||
if (executeActions(vd)){
|
||||
cancel = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
else{
|
||||
data.instantEatVL *= 0.6;
|
||||
}
|
||||
// Reset interaction.
|
||||
if (cancel) {
|
||||
// Fake interaction to prevent violation loops with false positives.
|
||||
final ItemStack actualStack = player.getItemInHand();
|
||||
data.instantEatFood = actualStack == null ? null : actualStack.getType();
|
||||
// TODO: Allows some abuse: 1. try instantly eat (cancelled) 2. consume item directly when needed.
|
||||
} else {
|
||||
data.instantEatFood = null;
|
||||
}
|
||||
data.instantEatInteract = time;
|
||||
return cancel;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user