parent
fc810f62ef
commit
8f41b5523c
2 changed files with 7 additions and 8 deletions
|
@ -687,11 +687,12 @@ public class GT_BlockMetaID_Machine extends BlockContainer implements IDebugable
|
||||||
public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
|
public int getDamageValue(World aWorld, int aX, int aY, int aZ) {
|
||||||
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
|
TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
|
||||||
|
|
||||||
if (tTileEntity != null && tTileEntity instanceof IGregTechTileEntity) {
|
if (tTileEntity instanceof IGregTechTileEntity) {
|
||||||
return ((IGregTechTileEntity)tTileEntity).getMetaTileID();
|
return ((IGregTechTileEntity) tTileEntity).getMetaTileID();
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
final int meta = aWorld.getBlockMetadata(aX, aY, aZ);
|
||||||
|
return meta > 0 && meta < 16 ? meta : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -52,9 +52,7 @@ public class GT_MetaMachine_Item extends ItemBlock {
|
||||||
mString4[tDamage] = "";
|
mString4[tDamage] = "";
|
||||||
mString5[tDamage] = "";
|
mString5[tDamage] = "";
|
||||||
mString6[tDamage] = "";
|
mString6[tDamage] = "";
|
||||||
if (tDamage == 0) {
|
if (tDamage != 0) {
|
||||||
|
|
||||||
} else {
|
|
||||||
TileEntity temp = GregTech_API.sBlockList[1].createTileEntity(aPlayer.worldObj, tDamage > 15 ? GregTech_API.mMetaTileList[tDamage] == null ? 0 : GregTech_API.mMetaTileList[tDamage].getTileEntityBaseType() : tDamage);
|
TileEntity temp = GregTech_API.sBlockList[1].createTileEntity(aPlayer.worldObj, tDamage > 15 ? GregTech_API.mMetaTileList[tDamage] == null ? 0 : GregTech_API.mMetaTileList[tDamage].getTileEntityBaseType() : tDamage);
|
||||||
if (temp != null) {
|
if (temp != null) {
|
||||||
temp.setWorldObj(aPlayer.worldObj); temp.xCoord = 0; temp.yCoord = 0; temp.zCoord = 0;
|
temp.setWorldObj(aPlayer.worldObj); temp.xCoord = 0; temp.yCoord = 0; temp.zCoord = 0;
|
||||||
|
|
Loading…
Reference in a new issue