Fix NPE in switch after removing a link

fnuecke · Jun 23, 2021 · ce64580 · ce64580
1 parent 73f1d81
commit ce64580
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/li/cil/oc2/common/tileentity/NetworkSwitchTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/NetworkSwitchTileEntity.java
@@ -50,7 +50,10 @@ public void writeEthernetFrame(final NetworkInterface source, final byte[] frame
                 // if packet is to same port, drop
                 return;
             }
-            adjacentInterfaces[host.iface].writeEthernetFrame(this, frame, timeToLive - TTL_COST);
+            NetworkInterface iface = adjacentInterfaces[host.iface];
+            if (iface != null) {
+                iface.writeEthernetFrame(this, frame, timeToLive - TTL_COST);
+            }
             host.timestamp = tickTime;
         } else {
             super.writeEthernetFrame(source, frame, timeToLive);