mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-04-18 06:10:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into dev/7.0-2

Browse Source
This commit is contained in:
Zoë Gidiere
2025-07-13 17:03:38 -06:00
parent 2d42810ba3 9f546370cd
commit b9187248c3
2 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/implementation/base/src/main/java/com/dfsek/terra/AbstractPlatform.java
View File

@@ -151,7 +151,7 @@ public abstract class AbstractPlatform implements Platform {
return Collections.emptySet();
}
protected void load() {
protected InternalAddon load() {
if(LOADED.get()) {
throw new IllegalStateException(
"Someone tried to initialize Terra, but Terra has already initialized. This is most likely due to a broken platform " +
@@ -200,6 +200,8 @@ public abstract class AbstractPlatform implements Platform {
logger.info("Terra addons successfully loaded.");
logger.info("Finished initialization.");
return internalAddon;
}
protected boolean loadConfigPacks() {