Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-06 00:49:09 +01:00
Code Issues Projects Releases Wiki Activity

Maybe fix a crash with the fermenting barrel?

Browse source
This commit is contained in:
Ellpeck 2016-12-03 23:43:42 +01:00
parent 52e87f8509
commit a30f094efa
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockContainerBase.java
View file

@ -216,10 +216,12 @@ public abstract class BlockContainerBase extends BlockContainer implements ItemB
if(tile instanceof TileEntityBase){ if(tile instanceof TileEntityBase){
TileEntityBase base = (TileEntityBase)tile; TileEntityBase base = (TileEntityBase)tile;
NBTTagCompound compound = stack.getTagCompound().getCompoundTag("Data"); NBTTagCompound compound = stack.getTagCompound().getCompoundTag("Data");
if(compound != null){
base.readSyncableNBT(compound, TileEntityBase.NBTType.SAVE_BLOCK); base.readSyncableNBT(compound, TileEntityBase.NBTType.SAVE_BLOCK);
} }
} }
} }
}
@Override @Override
public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player){ public void onBlockHarvested(World world, BlockPos pos, IBlockState state, EntityPlayer player){

5
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityFermentingBarrel.java
View file

@ -64,7 +64,10 @@ public class TileEntityFermentingBarrel extends TileEntityBase implements IShari
public void readSyncableNBT(NBTTagCompound compound, NBTType type){ public void readSyncableNBT(NBTTagCompound compound, NBTType type){
this.currentProcessTime = compound.getInteger("ProcessTime"); this.currentProcessTime = compound.getInteger("ProcessTime");
this.canolaTank.readFromNBT(compound); this.canolaTank.readFromNBT(compound);
this.oilTank.readFromNBT((NBTTagCompound)compound.getTag("OilTank")); NBTTagCompound tag = compound.getCompoundTag("OilTank");
if(tag != null){
this.oilTank.readFromNBT(tag);
}
super.readSyncableNBT(compound, type); super.readSyncableNBT(compound, type);
} }