From 187875fed54f6b6708beb5c0ce00e6c5ae3c89ae Mon Sep 17 00:00:00 2001 From: Julia <78276563+Vlamonster@users.noreply.github.com> Date: Mon, 3 Feb 2025 18:19:05 +0100 Subject: [PATCH] Fix settings. (#144) Co-authored-by: Julia Dijkstra Co-authored-by: Maya <10861407+serenibyss@users.noreply.github.com> --- src/main/scala/li/cil/oc/Settings.scala | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/scala/li/cil/oc/Settings.scala b/src/main/scala/li/cil/oc/Settings.scala index ed46d6aac8..bbc559f0c9 100644 --- a/src/main/scala/li/cil/oc/Settings.scala +++ b/src/main/scala/li/cil/oc/Settings.scala @@ -23,6 +23,7 @@ import scala.collection.JavaConverters._ import scala.collection.convert.WrapAsScala._ import scala.collection.mutable import scala.io.{Codec, Source} +import scala.util.Try import scala.util.matching.Regex class Settings(val config: Config) { @@ -639,8 +640,8 @@ object Settings { if (fileringRulesPatchVersion.containsVersion(configVersion)) { OpenComputers.log.info(s"=> Migrating Internet Card filtering rules. ") val cidrPattern = """(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?:/(\d{1,2}))""".r - val httpHostWhitelist = patched.getStringList(prefix + "internet.whitelist") - val httpHostBlacklist = patched.getStringList(prefix + "internet.blacklist") + val httpHostWhitelist = Try(patched.getStringList(prefix + "internet.whitelist")).getOrElse(new java.util.ArrayList[String]()) + val httpHostBlacklist = Try(patched.getStringList(prefix + "internet.blacklist")).getOrElse(new java.util.ArrayList[String]()) val internetFilteringRules = mutable.MutableList[String]() for (blockedAddress <- httpHostBlacklist) { if (cidrPattern.findFirstIn(blockedAddress).isDefined) {