Merge pull request #8 from tomevoll/patch-1
NullPointer crash in TileExternalStorage (worldObj is null on world load)
This commit is contained in:
		@@ -34,8 +34,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
 | 
				
			|||||||
    private int compare = 0;
 | 
					    private int compare = 0;
 | 
				
			||||||
    private int mode = 0;
 | 
					    private int mode = 0;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @SideOnly(Side.CLIENT)
 | 
					   private int stored = 0;
 | 
				
			||||||
    private int stored = 0;
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					    @Override
 | 
				
			||||||
    public int getEnergyUsage() {
 | 
					    public int getEnergyUsage() {
 | 
				
			||||||
@@ -164,6 +163,7 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
 | 
				
			|||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    public TileEntity getConnectedTile() {
 | 
					    public TileEntity getConnectedTile() {
 | 
				
			||||||
 | 
					        if(worldObj == null) return null;
 | 
				
			||||||
        TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection()));
 | 
					        TileEntity tile = worldObj.getTileEntity(pos.offset(getDirection()));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) {
 | 
					        if (tile instanceof IInventory || tile instanceof IDeepStorageUnit) {
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user