From ce64580c3c6c0a117c4d2955fe5f953e9589a219 Mon Sep 17 00:00:00 2001 From: Kilobyte22 Date: Thu, 24 Jun 2021 00:48:17 +0200 Subject: [PATCH] Fix NPE in switch after removing a link --- .../cil/oc2/common/tileentity/NetworkSwitchTileEntity.java | 5 ++++- 1 file changed, 4 insertions(+), 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 index ae0dbf87..a5dd1a7a 100644 --- 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);