Upstream
/
NoCheatPlus
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix overrides not respecting external side conditions.

This commit is contained in:
asofold 2018-01-21 18:56:17 +01:00
parent 6bf5b4c180
commit e7aa12141a
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
NCPCore/src/main/java/fr/neatmonster/nocheatplus/utilities/map/BlockProperties.java
View File

@ -1744,7 +1744,8 @@ public class BlockProperties {
;
Long override = breakingTimeOverrides.get(bbKey);
if (override != null) {
return override;
float mult = getBlockBreakingPenaltyMultiplier(onGround, inWater, aquaAffinity);
return mult == 1.0f ? override : (long) (mult * override);
}
// TODO: Keep up to date with BlockBreakKey, allow inWater and haste to not be set (calculate).
@ -1818,14 +1819,10 @@ public class BlockProperties {
}
if (isValidTool || blockProps.tool.toolType == ToolType.NONE) {
float mult = 1f;
if (inWater && !aquaAffinity) {
mult *= breakPenaltyInWater;
float mult = getBlockBreakingPenaltyMultiplier(onGround, inWater, aquaAffinity);
if (mult != 1f) {
duration *= mult;
}
if (!onGround) {
mult *= breakPenaltyOffGround;
}
duration = (long) (mult * duration);
// Efficiency level.
if (efficiency > 0) {
@ -1895,6 +1892,18 @@ public class BlockProperties {
return Math.max(0, duration);
}
private static float getBlockBreakingPenaltyMultiplier(
final boolean onGround, final boolean inWater, final boolean aquaAffinity) {
float mult = 1f;
if (inWater && !aquaAffinity) {
mult *= breakPenaltyInWater;
}
if (!onGround) {
mult *= breakPenaltyOffGround;
}
return mult;
}
/**
* Check if the tool is officially appropriate for the block id, counting in
* efficiency enchantments.