Upstream/NoCheatPlus
1
0
Fork 0
mirror of https://github.com/NoCheatPlus/NoCheatPlus.git synced 2024-11-07 11:10:05 +01:00
Code Issues Projects Releases Wiki Activity

[BLIND] Quick fix attempt for Acacia leaves (adding a new block-flag).

Browse Source
This commit is contained in:
asofold 2013-12-29 22:58:37 +01:00
parent 77a6307fcb
commit 2b0b0a8155
1 changed files with 10 additions and 2 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

@ -343,6 +343,9 @@ public class BlockProperties {
/** ICE */ /** ICE */
public static final long F_ICE = 0x20000; public static final long F_ICE = 0x20000;
/** LEAVES */
public static final long F_LEAVES = 0x40000;
/** /**
* Map flag to names. * Map flag to names.
*/ */
@ -610,6 +613,7 @@ public class BlockProperties {
Material.LEAVES, Material.BED_BLOCK}){ Material.LEAVES, Material.BED_BLOCK}){
blocks[mat.getId()] = leafType; blocks[mat.getId()] = leafType;
} }
blockFlags[Material.LEAVES.getId()] |= F_LEAVES;
// Huge mushroom type (...) // Huge mushroom type (...)
for (Material mat : new Material[]{ for (Material mat : new Material[]{
Material.HUGE_MUSHROOM_1, Material.HUGE_MUSHROOM_2, Material.HUGE_MUSHROOM_1, Material.HUGE_MUSHROOM_2,
@ -969,7 +973,7 @@ public class BlockProperties {
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) {
if (efficiency > 0){ if (efficiency > 0){
// Workaround until something better is found.. // Workaround until something better is found..
if (blockId == Material.LEAVES.getId() || 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,
* still getting exact durations would be nice to have, for expected breaking times and * still getting exact durations would be nice to have, for expected breaking times and
@ -1018,7 +1022,7 @@ public class BlockProperties {
duration = 240; duration = 240;
isValidTool = true; isValidTool = true;
} }
else if (blockId == Material.LEAVES.getId()){ else if (isLeaves(blockId)){
duration = 20; duration = 20;
isValidTool = true; isValidTool = true;
} }
@ -1269,6 +1273,10 @@ public class BlockProperties {
return (blockFlags[id] & F_ICE) != 0; return (blockFlags[id] & F_ICE) != 0;
} }
public static final boolean isLeaves(final int id) {
return (blockFlags[id] & F_LEAVES) != 0;
}
/** /**
* Might hold true for liquids too. * Might hold true for liquids too.
* @param id * @param id