Skip to content

Commit

Permalink
Fix #342
Browse files Browse the repository at this point in the history
  • Loading branch information
Thorinwasher committed Jun 10, 2024
1 parent cae2fb5 commit e2cda20
Showing 1 changed file with 16 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@
import org.sgrewritten.stargate.exception.name.NameLengthException;
import org.sgrewritten.stargate.gate.Gate;
import org.sgrewritten.stargate.network.StorageType;
import org.sgrewritten.stargate.network.portal.GlobalPortalId;
import org.sgrewritten.stargate.network.portal.portaldata.PortalData;
import org.sgrewritten.stargate.property.StargateConstant;
import org.sgrewritten.stargate.util.database.PortalStorageHelper;
import org.sgrewritten.stargate.util.portal.PortalCreationHelper;

Expand Down Expand Up @@ -66,6 +68,7 @@ private LegacyPortalStorageLoader() {

BufferedReader reader = FileHelper.getBufferedReader(file);
String line = reader.readLine();
List<GlobalPortalId> invalidPortals = new ArrayList<>();
while (line != null) {
if (line.startsWith("#") || line.trim().isEmpty()) {
continue;
Expand All @@ -78,12 +81,25 @@ private LegacyPortalStorageLoader() {
}
try {
portals.add(readPortal(line, world, stargateAPI, defaultNetworkName));
} catch (InvalidStructureException e) {
String[] portalProperties = line.split(":");
invalidPortals.add(new GlobalPortalId(portalProperties[0], (portalProperties.length > 9) ? portalProperties[9] : StargateConstant.DEFAULT_NETWORK_ID) );
} catch (Exception e) {
Stargate.log(e);
}
line = reader.readLine();
}
reader.close();
if(!invalidPortals.isEmpty()){
final StringBuilder stringBuilder = new StringBuilder("Could not load the following gate formats:");
invalidPortals.forEach(globalPortalId -> {
stringBuilder.append("\n");
stringBuilder.append(globalPortalId.toString());
});
stringBuilder.append("\n\n");
stringBuilder.append("This has most likely been caused by an invalid or absent gate format");
Stargate.log(Level.WARNING, stringBuilder.toString());
}
}
return portals;
}
Expand Down

0 comments on commit e2cda20

Please sign in to comment.