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

Fixed crash relating to MCMP

Browse Source
This commit is contained in:
raoulvdberge
2017-07-09 21:03:59 +02:00
parent cfa8491e83
commit f38aceddd4
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -1,5 +1,8 @@
# Refined Storage Changelog # Refined Storage Changelog
### 1.5.9
- Fixed crash relating to MCMP (raoulvdberge)
### 1.5.8 ### 1.5.8
- Updated Forge to 2400 (raoulvdberge) - Updated Forge to 2400 (raoulvdberge)
- Updated Storage Drawers API (raoulvdberge, jaquadro) - Updated Storage Drawers API (raoulvdberge, jaquadro)

5
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/NetworkNode.java
View File

@@ -6,6 +6,8 @@ import com.raoulvdberge.refinedstorage.api.network.INetworkNodeVisitor;
import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode; import com.raoulvdberge.refinedstorage.api.network.node.INetworkNode;
import com.raoulvdberge.refinedstorage.api.util.IWrenchable; import com.raoulvdberge.refinedstorage.api.util.IWrenchable;
import com.raoulvdberge.refinedstorage.apiimpl.API; import com.raoulvdberge.refinedstorage.apiimpl.API;
import com.raoulvdberge.refinedstorage.integration.mcmp.IntegrationMCMP;
import com.raoulvdberge.refinedstorage.integration.mcmp.RSMCMPAddon;
import com.raoulvdberge.refinedstorage.tile.TileBase; import com.raoulvdberge.refinedstorage.tile.TileBase;
import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode; import com.raoulvdberge.refinedstorage.tile.config.RedstoneMode;
import net.minecraft.block.state.IBlockState; import net.minecraft.block.state.IBlockState;
@@ -191,8 +193,9 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor,
return direction; return direction;
} }
// @todo: move this data to the network node
public void resetDirection() { public void resetDirection() {
this.direction = ((TileBase) world.getTileEntity(pos)).getDirection(); this.direction = ((TileBase) (IntegrationMCMP.isLoaded() ? RSMCMPAddon.unwrapTile(world, pos) : world.getTileEntity(pos))).getDirection();
} }
@Nullable @Nullable