dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed disk manipulator crash, fixes #1040

Browse Source
This commit is contained in:
raoulvdberge
2017-03-11 10:35:41 +01:00
parent 9c322bad7c
commit 5b28fa7dba
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -17,6 +17,7 @@
- Fixed OPs not having global permissions on secured storage systems (raoulvdberge) - Fixed OPs not having global permissions on secured storage systems (raoulvdberge)
- Fixed crash when Destructor tries to break secured network block (raoulvdberge) - Fixed crash when Destructor tries to break secured network block (raoulvdberge)
- Fixed Fluid Interface not dropping inventory contents (raoulvdberge) - Fixed Fluid Interface not dropping inventory contents (raoulvdberge)
- Fixed Disk Manipulator crash (raoulvdberge)
- Updated Forge to 2232 (raoulvdberge) - Updated Forge to 2232 (raoulvdberge)
### 1.4 ### 1.4

10
src/main/java/com/raoulvdberge/refinedstorage/block/BlockDiskManipulator.java
View File

@@ -42,7 +42,15 @@ public class BlockDiskManipulator extends BlockNode {
@Override @Override
public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) { public IBlockState getExtendedState(IBlockState state, IBlockAccess world, BlockPos pos) {
return ((IExtendedBlockState) super.getExtendedState(state, world, pos)).withProperty(DISK_STATE, ((TileDiskManipulator) world.getTileEntity(pos)).getDiskState()); IBlockState s = super.getExtendedState(state, world, pos);
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileDiskManipulator) {
s = ((IExtendedBlockState) s).withProperty(DISK_STATE, ((TileDiskManipulator) tile).getDiskState());
}
return s;
} }
@Override @Override