mirrors/Flywheel
0
0
Fork 0
mirror of https://github.com/Jozufozu/Flywheel.git synced 2024-11-14 06:24:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1045 from TheBv/mc1.15/dev

Browse Source 
Fixed issues with the blockzapper and FTBChunks
This commit is contained in:
simibubi 2021-02-19 14:46:48 +01:00 committed by GitHub
commit 37434f3933
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/com/simibubi/create/content/curiosities/zapper/blockzapper/BlockzapperItem.java
View File

@ -109,7 +109,7 @@ public class BlockzapperItem extends ZapperItem {
continue; continue;
if (!selectedState.isValidPosition(world, placed)) if (!selectedState.isValidPosition(world, placed))
continue; continue;
if (!player.isCreative() && !canBreak(stack, world.getBlockState(placed), world, placed)) if (!player.isCreative() && !canBreak(stack, world.getBlockState(placed), world, placed,player))
continue; continue;
if (!player.isCreative() && BlockHelper.findAndRemoveInInventory(selectedState, player, 1) == 0) { if (!player.isCreative() && BlockHelper.findAndRemoveInInventory(selectedState, player, 1) == 0) {
player.getCooldownTracker() player.getCooldownTracker()
@ -278,10 +278,13 @@ public class BlockzapperItem extends ZapperItem {
return list; return list;
} }
public static boolean canBreak(ItemStack stack, BlockState state, World world, BlockPos pos) { public static boolean canBreak(ItemStack stack, BlockState state, World world, BlockPos pos,PlayerEntity player) {
ComponentTier tier = getTier(Components.Body, stack); ComponentTier tier = getTier(Components.Body, stack);
float blockHardness = state.getBlockHardness(world, pos); float blockHardness = state.getBlockHardness(world, pos);
//If we can't change the block (e.g chunk protection)
if (!isAllowedToPlace(world,pos,player)){
return false;
}
if (blockHardness == -1) if (blockHardness == -1)
return false; return false;
if (tier == ComponentTier.None) if (tier == ComponentTier.None)
@ -294,6 +297,14 @@ public class BlockzapperItem extends ZapperItem {
return false; return false;
} }
public static boolean isAllowedToPlace(World world, BlockPos pos,PlayerEntity player){
BlockSnapshot blocksnapshot = BlockSnapshot.getBlockSnapshot(world, pos);
if (ForgeEventFactory.onBlockPlace(player, blocksnapshot, Direction.UP)) {
return false;
}
return true;
}
public static int getMaxAoe(ItemStack stack) { public static int getMaxAoe(ItemStack stack) {
ComponentTier tier = getTier(Components.Amplifier, stack); ComponentTier tier = getTier(Components.Amplifier, stack);
if (tier == ComponentTier.None) if (tier == ComponentTier.None)