Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-09-28 22:47:32 +02:00
Code Issues Projects Releases Wiki Activity

Lessen repetition of violation with false positives for FastConsume.

Browse Source
This commit is contained in:
asofold 2015-07-08 14:10:56 +02:00
parent 953af13405
commit 705170f80c
1 changed files with 100 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

191
NCPCompatBukkit/src/main/java/fr/neatmonster/nocheatplus/checks/inventory/FastConsume.java
View File

@ -28,99 +28,108 @@ import fr.neatmonster.nocheatplus.utilities.TickTask;
* *
*/ */
public class FastConsume extends Check implements Listener{ 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 Counters counters = NCPAPIProvider.getNoCheatPlusAPI().getGenericInstance(Counters.class);
private final int idCancelDead = counters.registerKey("canceldead"); private final int idCancelDead = counters.registerKey("canceldead");
public FastConsume() { public FastConsume() {
super(CheckType.INVENTORY_FASTCONSUME); super(CheckType.INVENTORY_FASTCONSUME);
// Overrides the instant-eat check. // Overrides the instant-eat check.
ConfigManager.setForAllConfigs(ConfPaths.INVENTORY_INSTANTEAT_CHECK, false); ConfigManager.setForAllConfigs(ConfPaths.INVENTORY_INSTANTEAT_CHECK, false);
StaticLog.logInfo("[NoCheatPlus] Inventory checks: FastConsume is available, disabled InstantEat."); StaticLog.logInfo("[NoCheatPlus] Inventory checks: FastConsume is available, disabled InstantEat.");
} }
@EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.LOWEST, ignoreCancelled = true)
public void onItemConsume(final PlayerItemConsumeEvent event){ public void onItemConsume(final PlayerItemConsumeEvent event){
final Player player = event.getPlayer(); final Player player = event.getPlayer();
if (player.isDead() && BridgeHealth.getHealth(player) <= 0.0) { if (player.isDead() && BridgeHealth.getHealth(player) <= 0.0) {
// Eat after death. // Eat after death.
event.setCancelled(true); event.setCancelled(true);
counters.addPrimaryThread(idCancelDead, 1); counters.addPrimaryThread(idCancelDead, 1);
return; return;
} }
if (!isEnabled(player)) { if (!isEnabled(player)) {
return; return;
} }
final InventoryData data = InventoryData.getData(player); final InventoryData data = InventoryData.getData(player);
final long time = System.currentTimeMillis(); final long time = System.currentTimeMillis();
if (check(player, event.getItem(), time, data)){ if (check(player, event.getItem(), time, data)){
event.setCancelled(true); event.setCancelled(true);
DataManager.getPlayerData(player.getName(), true).task.updateInventory(); 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.
private boolean check(final Player player, final ItemStack stack, final long time, final InventoryData data){ // Consistency checks...
// Uses the instant-eat data for convenience. if (stack == null){ // || stack.getType() != data.instantEatFood){
// Consistency checks... // TODO: Strict version should prevent other material (?).
if (stack == null){ // || stack.getType() != data.instantEatFood){ return false;
// 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){
final long ref = data.instantEatInteract == 0 ? 0 : Math.max(data.instantEatInteract, data.lastClickTime); // Time ran backwards.
if (time < ref){ data.instantEatInteract = data.lastClickTime = time;
// Time ran backwards. return false;
data.instantEatInteract = data.lastClickTime = time; }
return false; // Check exceptions.
} final InventoryConfig cc = InventoryConfig.getConfig(player);
// Check exceptions. final Material mat = stack == null ? null : stack.getType();
final InventoryConfig cc = InventoryConfig.getConfig(player); if (mat != null){
final Material mat = stack == null ? null : stack.getType(); if (cc.fastConsumeWhitelist){
if (mat != null){ if (!cc.fastConsumeItems.contains(mat)){
if (cc.fastConsumeWhitelist){ return false;
if (!cc.fastConsumeItems.contains(mat)){ }
return false; }
} else 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.
// Actually check. final long expectedDuration = cc.fastConsumeDuration;
final long timeSpent = ref == 0 ? 0 : (time - ref); // Not interact = instant. boolean cancel = false;
final long expectedDuration = cc.fastConsumeDuration; if (timeSpent < expectedDuration){
if (timeSpent < expectedDuration){ // TODO: Might have to do a specialized check for lag spikes here instead.
// TODO: Might have to do a specialized check for lag spikes here instead. final float lag = TickTask.getLag(expectedDuration, true);
final float lag = TickTask.getLag(expectedDuration, true); if (timeSpent * lag < expectedDuration){
if (timeSpent * lag < expectedDuration){ final double difference = (expectedDuration - timeSpent * lag) / 100.0;
final double difference = (expectedDuration - timeSpent * lag) / 100.0; data.instantEatVL += difference;
data.instantEatVL += difference; final ViolationData vd = new ViolationData(this, player, data.instantEatVL, difference, cc.fastConsumeActions);
final ViolationData vd = new ViolationData(this, player, data.instantEatVL, difference, cc.fastConsumeActions); vd.setParameter(ParameterName.FOOD, "" + mat);
vd.setParameter(ParameterName.FOOD, "" + mat); if (data.instantEatFood != mat){
if (data.instantEatFood != mat){ vd.setParameter(ParameterName.TAGS, "inconsistent(" + data.instantEatFood + ")");
vd.setParameter(ParameterName.TAGS, "inconsistent(" + data.instantEatFood + ")"); }
} else{
else{ vd.setParameter(ParameterName.TAGS, "");
vd.setParameter(ParameterName.TAGS, ""); }
} if (executeActions(vd)){
if (executeActions(vd)){ cancel = true;
return true; }
} }
} }
} else{
else{ data.instantEatVL *= 0.6;
data.instantEatVL *= 0.6; }
} // Reset interaction.
return false; 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;
}
} }