mirror of
https://github.com/GTNewHorizons/TinkersConstruct.git
synced 2026-11-22 21:20:06 +00:00
Fix broken tools AOE harvesting and harvesting stuff above stone level.
Due to how forge/MC does things it's not possible to prevent stone-level from being harvested without extra events. Closes #1775
This commit is contained in:
1 parent
75b97cf4f9
commit
dad8ab969c
2 files changed
+8
-2
No files matched your search
@@ -6,6 +6,7 @@ import net.minecraft.client.multiplayer.PlayerControllerMP;
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.entity.player.EntityPlayerMP;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
import net.minecraft.server.management.ItemInWorldManager;
|
||||
import net.minecraft.util.MovingObjectPosition;
|
||||
|
||||
@@ -29,7 +30,12 @@ public abstract class AOEHarvestTool extends HarvestTool {
|
||||
// only effective materials matter. We don't want to aoe when beraking dirt with a hammer.
|
||||
Block block = player.worldObj.getBlock(x,y,z);
|
||||
int meta = player.worldObj.getBlockMetadata(x,y,z);
|
||||
if(block == null || !isEffective(block, meta))
|
||||
if(block == null || !isEffective(block, meta) || !stack.hasTagCompound())
|
||||
return super.onBlockStartBreak(stack, x,y,z, player);
|
||||
|
||||
// tool broken?
|
||||
NBTTagCompound toolTags = stack.getTagCompound().getCompoundTag("InfiTool");
|
||||
if(toolTags == null || toolTags.getBoolean("Broken"))
|
||||
return super.onBlockStartBreak(stack, x,y,z, player);
|
||||
|
||||
MovingObjectPosition mop = AbilityHelper.raytraceFromEntity(player.worldObj, player, false, 4.5d);
|
||||
|
||||
@@ -58,7 +58,7 @@ public abstract class HarvestTool extends ToolCore
|
||||
NBTTagCompound tags = stack.getTagCompound().getCompoundTag("InfiTool");
|
||||
// broken tools suck.
|
||||
if (tags.getBoolean("Broken"))
|
||||
return -1;
|
||||
return 0;
|
||||
|
||||
// tadaaaa
|
||||
return tags.getInteger("HarvestLevel");
|
||||
|
||||
Reference in new issue
Block a user