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

fix defaulting join-classpath to true for plugin deps

Browse source
This commit is contained in:
Jake Potrebic 2023-06-08 06:50:41 -07:00
parent ddd74452e4
commit 8ca7fa95c0
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -5286,25 +5286,23 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
@@ -0,0 +0,0 @@ @@ -0,0 +0,0 @@
+package io.papermc.paper.plugin.provider.configuration.type; +package io.papermc.paper.plugin.provider.configuration.type;
+ +
+import org.checkerframework.checker.nullness.qual.NonNull;
+import org.checkerframework.framework.qual.DefaultQualifier;
+import org.spongepowered.configurate.objectmapping.ConfigSerializable; +import org.spongepowered.configurate.objectmapping.ConfigSerializable;
+ +
+import static java.util.Objects.requireNonNullElse;
+
+@DefaultQualifier(NonNull.class)
+@ConfigSerializable +@ConfigSerializable
+public record DependencyConfiguration( +public record DependencyConfiguration(
+ LoadOrder load, + LoadOrder load,
+ boolean required, + Boolean required,
+ boolean joinClasspath + Boolean joinClasspath
+) { +) {
+ + @SuppressWarnings("DataFlowIssue") // incorrect intellij inspections
+ public DependencyConfiguration(boolean required, boolean joinClasspath) { + public DependencyConfiguration {
+ this(LoadOrder.OMIT, required, joinClasspath); + required = requireNonNullElse(required, true);
+ } + joinClasspath = requireNonNullElse(joinClasspath, true);
+
+ public DependencyConfiguration(boolean required) {
+ this(required, true);
+ }
+
+ public DependencyConfiguration() {
+ this(true);
+ } + }
+ +
+ @ConfigSerializable + @ConfigSerializable