OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-01 17:01:56 +01:00
Code Issues Projects Releases Packages Wiki Activity

Validate providers when populating load order tree (#8890)

Browse source
This commit is contained in:
Owen1212055 2023-02-22 10:59:12 -05:00
parent ee1dffb8d5
commit 75e61d5bf2
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
patches/server/Paper-Plugins.patch
View file

@ -1590,6 +1590,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+import java.util.ArrayList; +import java.util.ArrayList;
+import java.util.List; +import java.util.List;
+import java.util.Map; +import java.util.Map;
+import java.util.function.Predicate;
+ +
+@SuppressWarnings("UnstableApiUsage") +@SuppressWarnings("UnstableApiUsage")
+public class DependencyUtil { +public class DependencyUtil {
@ -1614,14 +1615,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ @NotNull + @NotNull
+ public static MutableGraph<String> buildLoadGraph(@NotNull MutableGraph<String> dependencyGraph, @NotNull LoadOrderConfiguration configuration) { + public static MutableGraph<String> buildLoadGraph(@NotNull MutableGraph<String> dependencyGraph, @NotNull LoadOrderConfiguration configuration, Predicate<String> validator) {
+ String identifier = configuration.getMeta().getName(); + String identifier = configuration.getMeta().getName();
+ for (String dependency : configuration.getLoadAfter()) { + for (String dependency : configuration.getLoadAfter()) {
+ dependencyGraph.putEdge(identifier, dependency); + if (validator.test(dependency)) {
+ dependencyGraph.putEdge(identifier, dependency);
+ }
+ } + }
+ +
+ for (String loadBeforeTarget : configuration.getLoadBefore()) { + for (String loadBeforeTarget : configuration.getLoadBefore()) {
+ dependencyGraph.putEdge(loadBeforeTarget, identifier); + if (validator.test(loadBeforeTarget)) {
+ dependencyGraph.putEdge(loadBeforeTarget, identifier);
+ }
+ } + }
+ +
+ dependencyGraph.addNode(identifier); // Make sure dependencies at least have a node + dependencyGraph.addNode(identifier); // Make sure dependencies at least have a node
@ -2422,7 +2427,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ LoadOrderConfiguration loadOrderConfiguration = validated.createConfiguration(providerMapMirror); + LoadOrderConfiguration loadOrderConfiguration = validated.createConfiguration(providerMapMirror);
+ +
+ // Build a validated provider's load order changes + // Build a validated provider's load order changes
+ DependencyUtil.buildLoadGraph(loadOrderGraph, loadOrderConfiguration); + DependencyUtil.buildLoadGraph(loadOrderGraph, loadOrderConfiguration, providerMap::containsKey);
+ +
+ // Build a validated provider's dependencies into the graph + // Build a validated provider's dependencies into the graph
+ DependencyUtil.buildDependencyGraph(dependencyGraph, configuration); + DependencyUtil.buildDependencyGraph(dependencyGraph, configuration);