summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGiovanni Harting <539@idlegandalf.com>2016-10-18 20:27:53 +0200
committerGiovanni Harting <539@idlegandalf.com>2016-10-18 20:27:53 +0200
commitae4aef454e89cfb04cf46c6ea5a5b92e934047a4 (patch)
tree9e8f28603dbbc7980136c13afc8040265dac7900 /src
parent4e8222a8844163882c72d2327abd963b2e80a6ce (diff)
fixed fracture breaking bedrock, closes #35
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/sosnitzka/taiga/TAIGA.java2
-rw-r--r--src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java20
2 files changed, 13 insertions, 9 deletions
diff --git a/src/main/java/com/sosnitzka/taiga/TAIGA.java b/src/main/java/com/sosnitzka/taiga/TAIGA.java
index 7697a3a..b7d0f00 100644
--- a/src/main/java/com/sosnitzka/taiga/TAIGA.java
+++ b/src/main/java/com/sosnitzka/taiga/TAIGA.java
@@ -48,8 +48,6 @@ public class TAIGA {
public void preInit(FMLPreInitializationEvent e) {
proxy.initConfig();
- System.out.println(String.format("init from TAIGA Version %s", VERSION));
-
Items.register(); // Registers items and its oreDict
Blocks.register(); // Registers blocks and its items form a long with its oreDict
Fluids.register(); // Registers all fluids and its buckets
diff --git a/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java
index d35abce..bdc9b0b 100644
--- a/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java
+++ b/src/main/java/com/sosnitzka/taiga/traits/TraitFracture.java
@@ -3,6 +3,7 @@ package com.sosnitzka.taiga.traits;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
import net.minecraft.item.ItemStack;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
@@ -28,33 +29,38 @@ public class TraitFracture extends AbstractTrait {
switch (mop.sideHit) {
case UP:
BlockPos next1 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ());
- if (tool.canHarvestBlock(world.getBlockState(next1))) world.destroyBlock(next1, true);
+ if (tool.canHarvestBlock(world.getBlockState(next1)) && !world.getBlockState(next1).equals(Blocks.BEDROCK.getDefaultState()))
+ world.destroyBlock(next1, true);
break;
case DOWN:
BlockPos next2 = new BlockPos(pos.getX(), pos.getY() + i, pos.getZ());
- if (tool.canHarvestBlock(world.getBlockState(next2))) world.destroyBlock(next2, true);
+ if (tool.canHarvestBlock(world.getBlockState(next2)) && !world.getBlockState(next2).equals(Blocks.BEDROCK.getDefaultState()))
+ world.destroyBlock(next2, true);
break;
case WEST:
BlockPos next3 = new BlockPos(pos.getX() + i, pos.getY(), pos.getZ());
- if (tool.canHarvestBlock(world.getBlockState(next3))) world.destroyBlock(next3, true);
+ if (tool.canHarvestBlock(world.getBlockState(next3)) && !world.getBlockState(next3).equals(Blocks.BEDROCK.getDefaultState()))
+ world.destroyBlock(next3, true);
break;
case EAST:
BlockPos next4 = new BlockPos(pos.getX() - i, pos.getY(), pos.getZ());
- if (tool.canHarvestBlock(world.getBlockState(next4))) world.destroyBlock(next4, true);
+ if (tool.canHarvestBlock(world.getBlockState(next4)) && !world.getBlockState(next4).equals(Blocks.BEDROCK.getDefaultState()))
+ world.destroyBlock(next4, true);
break;
case SOUTH:
BlockPos next5 = new BlockPos(pos.getX(), pos.getY(), pos.getZ() - i);
- if (tool.canHarvestBlock(world.getBlockState(next5))) world.destroyBlock(next5, true);
+ if (tool.canHarvestBlock(world.getBlockState(next5)) && !world.getBlockState(next5).equals(Blocks.BEDROCK.getDefaultState()))
+ world.destroyBlock(next5, true);
break;
case NORTH:
BlockPos next6 = new BlockPos(pos.getX(), pos.getY() - i, pos.getZ() + i);
- if (tool.canHarvestBlock(world.getBlockState(next6))) world.destroyBlock(next6, true);
+ if (tool.canHarvestBlock(world.getBlockState(next6)) && !world.getBlockState(next6).equals(Blocks.BEDROCK.getDefaultState()))
+ world.destroyBlock(next6, true);
break;
}
}
if (random.nextBoolean()) ToolHelper.damageTool(tool, random.nextInt(5), player);
}
-
}
private float calcBonus(ItemStack tool) {