diff options
| author | Martin Robertz <dream-master@gmx.net> | 2019-10-30 14:47:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-30 14:47:56 +0100 |
| commit | bdec8af76cb0c8466ffa8f0e3c60420d61d02fc0 (patch) | |
| tree | 51035a2028a4795967a0902671a75d1776077694 /src/main | |
| parent | 5a8d05720a6b9da87f9b9e25bcc2dbcfacc5d1a7 (diff) | |
| parent | 48f34362e3ddff7e3f548c4862f4e6452703e21f (diff) | |
| download | GT5-Unofficial-bdec8af76cb0c8466ffa8f0e3c60420d61d02fc0.tar.gz GT5-Unofficial-bdec8af76cb0c8466ffa8f0e3c60420d61d02fc0.tar.bz2 GT5-Unofficial-bdec8af76cb0c8466ffa8f0e3c60420d61d02fc0.zip | |
Merge pull request #210 from observeroftime01/turbine-nbt-removal
Remove NBT data from turbines, preventing them from being disassembled.
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 31ce202792..88e7911d1e 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -435,7 +435,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { NBTTagCompound tNBT = mInventory[1].getTagCompound(); if (tNBT != null) { NBTTagCompound tNBT2 = tNBT.getCompoundTag("GT.CraftingComponents");//tNBT2 dont use out if - if (!tNBT.getBoolean("mDis")) { + /*if (!tNBT.getBoolean("mDis")) { tNBT2 = new NBTTagCompound(); Materials tMaterial = GT_MetaGenerated_Tool.getPrimaryMaterial(mInventory[1]); ItemStack tTurbine = GT_OreDictUnificator.get(OrePrefixes.turbineBlade, tMaterial, 1); @@ -487,7 +487,7 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { tNBT.setBoolean("mDis", true); mInventory[1].setTagCompound(tNBT); - } + }*/ } ((GT_MetaGenerated_Tool) mInventory[1].getItem()).doDamage(mInventory[1], (long)getDamageToComponent(mInventory[1]) * (long) Math.min(mEUt / this.damageFactorLow, Math.pow(mEUt, this.damageFactorHigh))); if (mInventory[1].stackSize == 0) mInventory[1] = null; |