From e96d668f2603e8136c4fc9d7af6eb2ca854cb1c2 Mon Sep 17 00:00:00 2001
From: DBotThePony <dbotthepony@yandex.ru>
Date: Fri, 29 Sep 2023 22:47:44 +0700
Subject: [PATCH] Add asset path stack push/pop when loading globals

---
 src/main/kotlin/ru/dbotthepony/kstarbound/GlobalDefaults.kt | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/main/kotlin/ru/dbotthepony/kstarbound/GlobalDefaults.kt b/src/main/kotlin/ru/dbotthepony/kstarbound/GlobalDefaults.kt
index b8717210..f7f6548a 100644
--- a/src/main/kotlin/ru/dbotthepony/kstarbound/GlobalDefaults.kt
+++ b/src/main/kotlin/ru/dbotthepony/kstarbound/GlobalDefaults.kt
@@ -3,6 +3,7 @@ package ru.dbotthepony.kstarbound
 import org.apache.logging.log4j.LogManager
 import ru.dbotthepony.kstarbound.defs.MovementParameters
 import ru.dbotthepony.kstarbound.defs.player.PlayerMovementParameters
+import ru.dbotthepony.kstarbound.util.AssetPathStack
 import java.util.concurrent.ForkJoinPool
 import java.util.concurrent.ForkJoinTask
 import kotlin.reflect.KMutableProperty0
@@ -40,7 +41,9 @@ object GlobalDefaults {
 			return EmptyTask
 		} else {
 			return executor.submit {
-				accept.set(Starbound.gson.fromJson(file.jsonReader(), T::class.java))
+				AssetPathStack("/") {
+					accept.set(Starbound.gson.fromJson(file.jsonReader(), T::class.java))
+				}
 			}
 		}
 	}