diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FastHeal.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FastHeal.java index 2101a043..5dcd7a6d 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FastHeal.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FastHeal.java @@ -26,6 +26,7 @@ public class FastHeal extends Check { // Reset. data.fastHealVL *= 0.96; // Only add a predefined amount to the buffer. + // TODO: Confine regain-conditions further? (e.g. if vl < 0.1) data.fastHealBuffer = Math.min(cc.fastHealBuffer, data.fastHealBuffer + 50L); } else{ diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java index 07c3c413..e3562f07 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/checks/fight/FightListener.java @@ -293,7 +293,7 @@ public class FightListener extends CheckListener implements JoinLeaveListener{ // It requested to "cancel" the players invulnerability, so set his noDamageTicks to 0. damagedPlayer.setNoDamageTicks(0); } - if (BridgeHealth.getHealth(damagedPlayer) == BridgeHealth.getMaxHealth(damagedPlayer)){ + if (BridgeHealth.getHealth(damagedPlayer) >= BridgeHealth.getMaxHealth(damagedPlayer)){ // TODO: Might use the same FightData instance for GodMode. if (damagedData.fastHealBuffer < 0){ // Reduce negative buffer with each full health. diff --git a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java index 2293c21e..0b5c3207 100644 --- a/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java +++ b/NCPCore/src/main/java/fr/neatmonster/nocheatplus/config/DefaultConfig.java @@ -26,7 +26,7 @@ public class DefaultConfig extends ConfigFile { * NCP build needed for this config. * (Should only increment with changing or removing paths.) */ - public static final int buildNumber = 490; + public static final int buildNumber = 632; // TODO: auto input full version or null to an extra variable or several [fail safe for other syntax checking]? @@ -337,7 +337,7 @@ public class DefaultConfig extends ConfigFile { set(ConfPaths.FIGHT_FASTHEAL_CHECK, true); set(ConfPaths.FIGHT_FASTHEAL_INTERVAL, 4000L); set(ConfPaths.FIGHT_FASTHEAL_BUFFER, 1000L); - set(ConfPaths.FIGHT_FASTHEAL_ACTIONS, "cancel vl>10 cancel log:fastheal:0:10:i vl>30 log:fastheal:0:10:if"); + set(ConfPaths.FIGHT_FASTHEAL_ACTIONS, "cancel vl>10 cancel log:fastheal:0:10:i vl>30 cancel log:fastheal:0:10:if"); set(ConfPaths.FIGHT_GODMODE_CHECK, true); set(ConfPaths.FIGHT_GODMODE_LAGMINAGE, 1100); // TODO: ndt/2 => 500-600.