mirror of
https://github.com/PurpurMC/Purpur.git
synced 2026-02-20 18:07:43 +01:00
Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@5613ed6d Provide env environment variable and copy spigots sys prop for overriding default repository PaperMC/Paper@62b7f86d Avoid and discourage use of Maven Central as a CDN (#12689) PaperMC/Paper@f5534cb7 [ci/skip] Run generators (#12691)
This commit is contained in:
@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
|
|||||||
version = 1.21.6-R0.1-SNAPSHOT
|
version = 1.21.6-R0.1-SNAPSHOT
|
||||||
|
|
||||||
mcVersion = 1.21.6
|
mcVersion = 1.21.6
|
||||||
paperCommit = 8980ead7ea8dddf4a1a37de7fc5d0d6fe7f86a37
|
paperCommit = f5534cb7c72733f193b535c9ff5eeacfae44992b
|
||||||
|
|
||||||
org.gradle.configuration-cache = true
|
org.gradle.configuration-cache = true
|
||||||
org.gradle.caching = true
|
org.gradle.caching = true
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
--- a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||||
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
+++ b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
|
||||||
@@ -63,6 +_,7 @@
|
@@ -66,6 +_,7 @@
|
||||||
session.setTransferListener(new AbstractTransferListener() {
|
session.setTransferListener(new AbstractTransferListener() {
|
||||||
@Override
|
@Override
|
||||||
public void transferStarted(@NotNull TransferEvent event) {
|
public void transferStarted(@NotNull TransferEvent event) {
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
|
logger.log(Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName());
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
@@ -88,6 +_,7 @@
|
@@ -91,6 +_,7 @@
|
||||||
// Paper end - plugin loader api
|
// Paper end - plugin loader api
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
logger.log(Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
logger.log(Level.INFO, "[{0}] Loading {1} libraries... please wait", new Object[]
|
||||||
{
|
{
|
||||||
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
java.util.Objects.requireNonNullElseGet(desc.getPrefix(), desc::getName), desc.getLibraries().size() // Paper - use configured log prefix
|
||||||
@@ -140,6 +_,7 @@
|
@@ -143,6 +_,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
jarFiles.add(url);
|
jarFiles.add(url);
|
||||||
|
|||||||
Reference in New Issue
Block a user