Merge remote-tracking branch 'origin/beta' into beta

j10a1n15 · Mar 26, 2024 · 86bad25 · 86bad25
2 parents bdf21ff + c41274a
commit 86bad25
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt
@@ -8,6 +8,7 @@ import at.hannibal2.skyhanni.events.LorenzEvent
 import at.hannibal2.skyhanni.events.PreInitFinishedEvent
 import at.hannibal2.skyhanni.events.RepositoryReloadEvent
 import at.hannibal2.skyhanni.utils.ConditionalUtils.afterChange
+import at.hannibal2.skyhanni.utils.LorenzUtils
 import at.hannibal2.skyhanni.utils.StringUtils.matches
 import net.minecraft.launchwrapper.Launch
 import net.minecraftforge.fml.common.FMLCommonHandler
@@ -57,6 +58,8 @@ object RepoPatternManager {
             }
         }
 
+    val localLoading: Boolean get() = config.forceLocal.get() || LorenzUtils.isInDevEnviromen()
+
     /**
      * Crash if in a development environment, or if inside a guarded event handler.
      */
@@ -98,7 +101,7 @@ object RepoPatternManager {
      */
     private fun reloadPatterns() {
         val remotePatterns =
-            if (config.forceLocal.get()) mapOf()
+            if (localLoading) mapOf()
             else regexes?.regexes ?: mapOf()
 
         for (it in usedKeys.values) {