From 5f24e1cd9f1f17483a765ec2e8c1b18d499b49af Mon Sep 17 00:00:00 2001 From: Raoul Van den Berge Date: Wed, 22 Jun 2016 00:12:46 +0200 Subject: [PATCH] Fix NPE --- .../api/network/NetworkMasterRegistry.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/refinedstorage/api/network/NetworkMasterRegistry.java b/src/main/java/refinedstorage/api/network/NetworkMasterRegistry.java index 94b600362..b0a6bc6e1 100755 --- a/src/main/java/refinedstorage/api/network/NetworkMasterRegistry.java +++ b/src/main/java/refinedstorage/api/network/NetworkMasterRegistry.java @@ -18,8 +18,13 @@ public class NetworkMasterRegistry { public static void remove(BlockPos pos, int dimension) { if (get(dimension) != null) { - get(dimension).get(pos).onRemoved(); - get(dimension).remove(pos); + NetworkMaster network = get(dimension).get(pos); + + if (network != null) { + network.onRemoved(); + + get(dimension).remove(pos); + } } }