Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/utils/AppStoreManager.java
This commit is contained in:
gnembon committed 2021-06-30 13:33:10 -03:00
commit 4f77327b6c
7 files changed
+194 -83

No files matched your search

@@ -70,7 +70,7 @@ import static net.minecraft.server.command.CommandManager.literal;
public class CarpetScriptHost extends ScriptHost
{
private final CarpetScriptServer scriptServer;
ServerCommandSource responsibleSource;
public ServerCommandSource responsibleSource;
private NbtElement globalState;
private int saveTimeout;
@@ -328,6 +328,15 @@ public class CarpetScriptHost extends ScriptHost
AppStoreManager.addResource(this, storeSource, resource);
}
}
Value libraries = config.get(new StringValue("libraries"));
if (libraries != null)
{
if (!(libraries instanceof ListValue)) throw new InternalExpressionException("App libraries not defined as a list");
for (Value library : ((ListValue) libraries).getItems())
{
AppStoreManager.addLibrary(this, storeSource, library);
}
}
}
appConfig = config;
}