diff options
| author | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:38:20 +0200 |
|---|---|---|
| committer | Blood-Asp <bloodasphendrik@gmail.com> | 2017-06-17 14:38:20 +0200 |
| commit | edc857c8a95d39d78bf2e4c325bd2f8d21334469 (patch) | |
| tree | a05e9da0dfb6f14e89019fa1c38391b8f8dec949 /src/main/java/gregtech/common/blocks/GT_Item_Machines.java | |
| parent | 617f057dad27b8d9fc1dde0c669569b09453a0ed (diff) | |
| parent | 909149cd28dad31993837595d60e3df096b19437 (diff) | |
| download | GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.gz GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.tar.bz2 GT5-Unofficial-edc857c8a95d39d78bf2e4c325bd2f8d21334469.zip | |
Merge branch 'unstable' of https://github.com/Blood-Asp/GT5-Unofficial into unstable
Diffstat (limited to 'src/main/java/gregtech/common/blocks/GT_Item_Machines.java')
| -rw-r--r-- | src/main/java/gregtech/common/blocks/GT_Item_Machines.java | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java index 4014b01f39..8189a8a52b 100644 --- a/src/main/java/gregtech/common/blocks/GT_Item_Machines.java +++ b/src/main/java/gregtech/common/blocks/GT_Item_Machines.java @@ -33,14 +33,9 @@ public class GT_Item_Machines if ((tDamage <= 0) || (tDamage >= GregTech_API.METATILEENTITIES.length)) {
return;
}
- TileEntity temp = GregTech_API.sBlockMachines.createTileEntity(aPlayer == null ? GT_Values.DW : aPlayer.worldObj, GregTech_API.METATILEENTITIES[tDamage] == null ? 0 : GregTech_API.METATILEENTITIES[tDamage].getTileEntityBaseType());
- temp.setWorldObj(aPlayer == null ? GT_Values.DW : aPlayer.worldObj);
- temp.xCoord = 0;
- temp.yCoord = 0;
- temp.zCoord = 0;
- if ((temp instanceof IGregTechTileEntity)) {
- IGregTechTileEntity tTileEntity = (IGregTechTileEntity) temp;
- tTileEntity.setInitialValuesAsNBT(new NBTTagCompound(), (short) tDamage);
+
+ if (GregTech_API.METATILEENTITIES[tDamage] != null) {
+ IGregTechTileEntity tTileEntity = GregTech_API.METATILEENTITIES[tDamage].getBaseMetaTileEntity();
if (tTileEntity.getDescription() != null) {
int i = 0;
for (String tDescription : tTileEntity.getDescription()) {
|