From 72d234fcb660774466df844ceb24ad257bb9fb3f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 1 Feb 2020 13:51:50 -0800 Subject: [PATCH] Don't allow chiseling of TileEntity --- gradle.properties | 2 +- .../java/team/chisel/item/chisel/ChiselController.java | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 953283d7..802f25af 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ -mod_version=2.9.5 +mod_version=2.9.6-GTNH minecraft_version=1.7.10 forge_version=10.13.4.1481-1.7.10 diff --git a/src/main/java/team/chisel/item/chisel/ChiselController.java b/src/main/java/team/chisel/item/chisel/ChiselController.java index 77572ea1..63738036 100644 --- a/src/main/java/team/chisel/item/chisel/ChiselController.java +++ b/src/main/java/team/chisel/item/chisel/ChiselController.java @@ -6,6 +6,7 @@ import java.util.Queue; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.event.entity.player.PlayerInteractEvent; @@ -88,6 +89,12 @@ public final class ChiselController { return; } + TileEntity te = event.world.getTileEntity(x, y, z); + if ( te != null) { + // Don't support chiseling tile entities + return; + } + List list = group.getVariations(); main: for (ItemStack stack : OreDictionary.getOres(group.getOreName())) {