Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 08:27:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated Upstream (Paper)

Browse Source 
Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@82a8012 [ci skip] adjust projects workflow for label changes
PaperMC/Paper@61c9c07 Fix CraftMetaBlockState adding extra tags
PaperMC/Paper@7f2d531 Rewrite reflection in library loader jars (#10608)
PaperMC/Paper@05308fc Remap plugin libraries with namespace set to spigot (#10610)
PaperMC/Paper@69a971a Reset component prototype on itemtype change
PaperMC/Paper@f9397e1 Fix incorrect Commodore mapping of sweeping enchant
This commit is contained in:
granny
2024-04-28 19:22:16 -07:00
parent ca767b015f
commit 1197553d30
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gradle.properties
View File

@@ -2,7 +2,7 @@ group = org.purpurmc.purpur
version = 1.20.5-R0.1-SNAPSHOT version = 1.20.5-R0.1-SNAPSHOT
mcVersion = 1.20.5 mcVersion = 1.20.5
paperCommit = 0f3e324152d03fdeb11ea8762325fc600d1e7fcb paperCommit = f9397e108e02ae558493d7bb63b0264af2cc7693
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

8
patches/api/0041-Add-log-suppression-for-LibraryLoader.patch
View File

@@ -17,10 +17,10 @@ index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..f1e58639213be0c43cd2ff090b625e7d
/** /**
* This class was not meant to be constructed explicitly * This class was not meant to be constructed explicitly
diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java diff --git a/src/main/java/org/bukkit/plugin/java/LibraryLoader.java b/src/main/java/org/bukkit/plugin/java/LibraryLoader.java
index f4d655a158410039305ac68cebe0d79000f73df8..449f36f73e7a16b3a7c1e7ea2a0ca9b59050db62 100644 index 8e1b6be2462aaa692efa1f72986921a6dc357196..b6e18b12fd4d61ce92203582906d24b4d14e6cc5 100644
--- 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
@@ -66,6 +66,7 @@ public class LibraryLoader @@ -68,6 +68,7 @@ public class LibraryLoader
@Override @Override
public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException public void transferStarted(@NotNull TransferEvent event) throws TransferCancelledException
{ {
@@ -28,7 +28,7 @@ index f4d655a158410039305ac68cebe0d79000f73df8..449f36f73e7a16b3a7c1e7ea2a0ca9b5
logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() ); logger.log( Level.INFO, "Downloading {0}", event.getResource().getRepositoryUrl() + event.getResource().getResourceName() );
} }
} ); } );
@@ -86,6 +87,7 @@ public class LibraryLoader @@ -88,6 +89,7 @@ public class LibraryLoader
{ {
return null; return null;
} }
@@ -36,7 +36,7 @@ index f4d655a158410039305ac68cebe0d79000f73df8..449f36f73e7a16b3a7c1e7ea2a0ca9b5
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
@@ -124,6 +126,7 @@ public class LibraryLoader @@ -135,6 +137,7 @@ public class LibraryLoader
} }
jarFiles.add( url ); jarFiles.add( url );

4
patches/server/0243-Spark-Profiler.patch
View File

@@ -6,10 +6,10 @@ Subject: [PATCH] Spark Profiler
Co-authored-by: granny <granny@purpurmc.org> Co-authored-by: granny <granny@purpurmc.org>
diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java diff --git a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
index bb1cfa8ea8b11fc36ea72c8e382b8554bccd0ce5..a1af6a07a5fcd280993ad9dae139f3343200692f 100644 index 6f14cb9a73faa1d0ae2939d08809d9f6c2a99e1d..4e98745670032038f7b4f8e1adabc1e00e7f15bf 100644
--- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java --- a/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
+++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java +++ b/src/main/java/io/papermc/paper/plugin/PluginInitializerManager.java
@@ -109,6 +109,7 @@ public class PluginInitializerManager { @@ -112,6 +112,7 @@ public class PluginInitializerManager {
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
java.util.List<Path> files = ((java.util.List<File>) optionSet.valuesOf("add-plugin")).stream().map(File::toPath).toList(); java.util.List<Path> files = ((java.util.List<File>) optionSet.valuesOf("add-plugin")).stream().map(File::toPath).toList();
io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.PluginFlagProviderSource.INSTANCE, files); io.papermc.paper.plugin.util.EntrypointUtil.registerProvidersFromSource(io.papermc.paper.plugin.provider.source.PluginFlagProviderSource.INSTANCE, files);