EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-18 05:14:43 +02:00
Code Issues Projects Releases Wiki Activity

As a semi-temporary measure, lets move 1.8 specific objects into their own classes, so we can be 1.7 and 1.8 compatable.

Browse Source
This commit is contained in:
t00thpick1
2014-12-19 13:48:06 -05:00
parent 429a7d926a
commit bfff5682b5
4 changed files with 52 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/gmail/nossr50/util/BlockUtils.java
View File

@ -15,6 +15,7 @@ import org.bukkit.material.SmoothBrick;
import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.repair.Repair;
import com.gmail.nossr50.skills.salvage.Salvage;
import com.gmail.nossr50.util.temp.DualSupport;
public final class BlockUtils {
private BlockUtils() {}
@ -63,22 +64,11 @@ public final class BlockUtils {
case DROPPER:
case HOPPER:
case TRAPPED_CHEST:
case IRON_TRAPDOOR:
case ACACIA_DOOR:
case SPRUCE_DOOR:
case BIRCH_DOOR:
case JUNGLE_DOOR:
case DARK_OAK_DOOR:
case IRON_DOOR:
case ACACIA_FENCE:
case DARK_OAK_FENCE:
case BIRCH_FENCE:
case JUNGLE_FENCE:
case ARMOR_STAND:
return false;
default:
return !isMcMMOAnvil(blockState) && !mcMMO.getModManager().isCustomAbilityBlock(blockState);
return DualSupport.canActivateAbilities(blockState) && !isMcMMOAnvil(blockState) && !mcMMO.getModManager().isCustomAbilityBlock(blockState);
}
}
@ -173,12 +163,10 @@ public final class BlockUtils {
case SANDSTONE:
case STAINED_CLAY:
case STONE:
case RED_SANDSTONE:
case PRISMARINE:
return true;
default:
return isOre(blockState) || mcMMO.getModManager().isCustomMiningBlock(blockState);
return DualSupport.affectedBySuperBreaker(blockState) || isOre(blockState) || mcMMO.getModManager().isCustomMiningBlock(blockState);
}
}