From f2444154d7ca902187580d799e4ee0799948eddd Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Sun, 10 Jul 2016 00:47:33 +0200 Subject: [PATCH] Fix crash with ext storage, fixes #178 --- CHANGELOG.md | 2 ++ src/main/java/refinedstorage/api/network/INetworkNode.java | 3 ++- src/main/java/refinedstorage/tile/TileNode.java | 2 +- .../java/refinedstorage/tile/controller/TileController.java | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12bea602b..4432f9861 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,8 @@ **Bugfixes** - Improved detector model, add a better hitbox for it - Improved the Wireless Transmitter texture +- Wireless Transmitter is now only bright red when connected +- Fixed crash with External Storage - Made the Solderer beams be bright red when they are working - Added better hitbox for the Solderer diff --git a/src/main/java/refinedstorage/api/network/INetworkNode.java b/src/main/java/refinedstorage/api/network/INetworkNode.java index df98431ea..854426326 100755 --- a/src/main/java/refinedstorage/api/network/INetworkNode.java +++ b/src/main/java/refinedstorage/api/network/INetworkNode.java @@ -31,8 +31,9 @@ public interface INetworkNode { /** * Called when this node is disconnected from a network. * + * @param network The network */ - void onDisconnected(); + void onDisconnected(INetworkMaster network); /** * Called when the connection state of this node changes. diff --git a/src/main/java/refinedstorage/tile/TileNode.java b/src/main/java/refinedstorage/tile/TileNode.java index c682b1c00..70202a4e6 100755 --- a/src/main/java/refinedstorage/tile/TileNode.java +++ b/src/main/java/refinedstorage/tile/TileNode.java @@ -68,7 +68,7 @@ public abstract class TileNode extends TileBase implements INetworkNode, ISynchr } @Override - public void onDisconnected() { + public void onDisconnected(INetworkMaster network) { onConnectionChange(network, false); this.connected = false; diff --git a/src/main/java/refinedstorage/tile/controller/TileController.java b/src/main/java/refinedstorage/tile/controller/TileController.java index 6ed1ef35e..22f6a9ee7 100755 --- a/src/main/java/refinedstorage/tile/controller/TileController.java +++ b/src/main/java/refinedstorage/tile/controller/TileController.java @@ -222,7 +222,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR public void disconnectAll() { for (INetworkNode node : nodes) { if (node.isConnected()) { - node.onDisconnected(); + node.onDisconnected(this); } } @@ -447,7 +447,7 @@ public class TileController extends TileBase implements INetworkMaster, IEnergyR for (INetworkNode oldNode : oldNodes) { if (!nodesPos.contains(oldNode.getPosition())) { - oldNode.onDisconnected(); + oldNode.onDisconnected(this); } } }