Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-02 11:22:01 +01:00
Code Issues Projects Releases Wiki Activity

Fix LegacyPluginLoader dependency registration (#9165)

Browse Source
This commit is contained in:
Owen1212055 2023-04-22 21:55:10 -04:00
parent 2da0966452
commit a4b55ff96a
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
patches/server/Paper-Plugins.patch
View File

@ -1867,6 +1867,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ return this.dependencies.contains(pluginIdentifier); + return this.dependencies.contains(pluginIdentifier);
+ } + }
+ +
+ // Used by the legacy loader -- this isn't recommended
+ public void addDirectDependency(String dependency) {
+ this.dependencies.add(dependency);
+ }
+
+ @Override + @Override
+ public String toString() { + public String toString() {
+ return "ProviderDependencyTree{" + + return "ProviderDependencyTree{" +
@ -2292,6 +2297,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ PluginMeta configuration = provider.getMeta(); + PluginMeta configuration = provider.getMeta();
+ +
+ PluginProvider<T> replacedProvider = providersToLoad.put(configuration.getName(), provider); + PluginProvider<T> replacedProvider = providersToLoad.put(configuration.getName(), provider);
+ dependencyTree.addDirectDependency(configuration.getName()); // add to dependency tree
+ if (replacedProvider != null) { + if (replacedProvider != null) {
+ LOGGER.severe(String.format( + LOGGER.severe(String.format(
+ "Ambiguous plugin name `%s' for files `%s' and `%s' in `%s'", + "Ambiguous plugin name `%s' for files `%s' and `%s' in `%s'",
@ -2324,6 +2330,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ )); + ));
+ } else { + } else {
+ String replacedPlugin = pluginsProvided.put(provided, configuration.getName()); + String replacedPlugin = pluginsProvided.put(provided, configuration.getName());
+ dependencyTree.addDirectDependency(provided); // add to dependency tree
+ if (replacedPlugin != null) { + if (replacedPlugin != null) {
+ LOGGER.warning(String.format( + LOGGER.warning(String.format(
+ "`%s' is provided by both `%s' and `%s'", + "`%s' is provided by both `%s' and `%s'",