Fix NPE during migration with network of name length 13

stargate-rewritten · Jun 19, 2024 · 6ab291f · 6ab291f
1 parent 4a6f328
commit 6ab291f
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/org/sgrewritten/stargate/util/LegacyPortalStorageLoader.java b/src/main/java/org/sgrewritten/stargate/util/LegacyPortalStorageLoader.java
@@ -80,7 +80,13 @@ private LegacyPortalStorageLoader() {
                     continue;
                 }
                 try {
-                    portals.add(readPortal(line, world, stargateAPI, defaultNetworkName));
+                    Portal portal = readPortal(line, world, stargateAPI, defaultNetworkName);
+                    if(portal != null) {
+                        portals.add(portal);
+                    } else {
+                        String[] portalProperties = line.split(":");
+                        invalidPortals.add(new GlobalPortalId(portalProperties[0], (portalProperties.length > 9) ? portalProperties[9] : StargateConstant.DEFAULT_NETWORK_ID));
+                    }
                 } catch (InvalidStructureException e) {
                     String[] portalProperties = line.split(":");
                     invalidPortals.add(new GlobalPortalId(portalProperties[0], (portalProperties.length > 9) ? portalProperties[9] : StargateConstant.DEFAULT_NETWORK_ID) );
@@ -97,7 +103,7 @@ private LegacyPortalStorageLoader() {
                     stringBuilder.append(globalPortalId.toString());
                 });
                 stringBuilder.append("\n\n");
-                stringBuilder.append("This has most likely been caused by an invalid or absent gate format");
+                stringBuilder.append("This has most likely been caused by an invalid or absent gate format or an invalid network name");
                 Stargate.log(Level.WARNING, stringBuilder.toString());
             }
         }