Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2025-01-28 18:31:24 +01:00
Code Issues Projects Releases Wiki Activity

Attempt to fix melons for 1.8 (might result in issues with pre-1.8).

Browse Source
This commit is contained in:
asofold 2014-12-06 20:06:27 +01:00
parent 79394c4e0a
commit ec997796b8
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,7 +702,7 @@ public class BlockProperties {
blocks[Material.SIGN_POST.getId()] = pumpkinType; blocks[Material.SIGN_POST.getId()] = pumpkinType;
blocks[Material.PUMPKIN.getId()] = pumpkinType; blocks[Material.PUMPKIN.getId()] = pumpkinType;
blocks[Material.JACK_O_LANTERN.getId()] = pumpkinType; blocks[Material.JACK_O_LANTERN.getId()] = pumpkinType;
blocks[Material.MELON_BLOCK.getId()] = new BlockProps(noTool, 1, secToMs(1.45), 3); // 1.5 but maybe event delay one tick. blocks[Material.MELON_BLOCK.getId()] = new BlockProps(woodAxe, 1f, secToMs(1.5, 0.75, 0.375, 0.25, 0.1875, 0.125), 3f);
blocks[Material.BOOKSHELF.getId()] = new BlockProps(woodAxe, 1.5f, secToMs(2.25, 1.15, 0.6, 0.4, 0.3, 0.2)); blocks[Material.BOOKSHELF.getId()] = new BlockProps(woodAxe, 1.5f, secToMs(2.25, 1.15, 0.6, 0.4, 0.3, 0.2));
for (Material mat : new Material[]{ for (Material mat : new Material[]{
Material.WOOD_STAIRS, Material.WOOD, Material.WOOD_STEP, Material.LOG, Material.WOOD_STAIRS, Material.WOOD, Material.WOOD_STEP, Material.LOG,
@ -1051,9 +1051,11 @@ public class BlockProperties {
return haste > 0 ? (long) (Math.pow(0.8, haste) * dur): dur; return haste > 0 ? (long) (Math.pow(0.8, haste) * dur): dur;
} }
public static long getBreakingDuration(final int blockId, final BlockProps blockProps, final ToolProps toolProps, final boolean onGround, final boolean inWater, boolean aquaAffinity, int efficiency) { public static long getBreakingDuration(final int blockId, final BlockProps blockProps, final ToolProps toolProps, final boolean onGround, final boolean inWater, boolean aquaAffinity, int efficiency) {
boolean isValidTool = isValidTool(blockId, blockProps, toolProps, efficiency);
if (efficiency > 0) { if (efficiency > 0) {
// Workaround until something better is found.. // Workaround until something better is found..
// TODO: Re-evaluate.ww
if (isLeaves(blockId) || blockProps == glassType) { if (isLeaves(blockId) || blockProps == glassType) {
/* /*
* TODO: Some might be dealt with by insta break, by now, * TODO: Some might be dealt with by insta break, by now,
@ -1067,10 +1069,6 @@ public class BlockProperties {
return 0; // insta break. return 0; // insta break.
} }
} }
else if (blockId == Material.MELON_BLOCK.getId()) {
// 450, 200 , 100 , 50 , 0
return 450 / (long) Math.pow(2, efficiency - 1);
}
else if (blockProps == chestType) { else if (blockProps == chestType) {
// TODO: The no tool time might be reference anyway for some block types. // TODO: The no tool time might be reference anyway for some block types.
return (long) ((double )blockProps.breakingTimes[0] / 5f / efficiency); return (long) ((double )blockProps.breakingTimes[0] / 5f / efficiency);
@ -1079,8 +1077,6 @@ public class BlockProperties {
long duration; long duration;
boolean isValidTool = isValidTool(blockId, blockProps, toolProps, efficiency);
if (isValidTool) { if (isValidTool) {
// appropriate tool // appropriate tool
duration = blockProps.breakingTimes[toolProps.materialBase.index]; duration = blockProps.breakingTimes[toolProps.materialBase.index];