Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-20 01:47:42 +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@2534e5c Fix other jigsaw related disconnect bug (#8414)
PaperMC/Paper@e9618f8 Add system property to dump stack on bad plugin class access (#8417)
PaperMC/Paper@6d14093 Add getDrops to BlockState and isPreferredTool to BlockData (#8284)
This commit is contained in:
BillyGalbreath
2022-10-01 12:21:22 -05:00
parent 955bd91c2b
commit e2922f538b
2 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

@@ -1,7 +1,7 @@
group = org.purpurmc.purpur group = org.purpurmc.purpur
version = 1.19.2-R0.1-SNAPSHOT version = 1.19.2-R0.1-SNAPSHOT
paperCommit = f5fa69173cb59bf9fb4420163a25e305c7218b6b paperCommit = 6d1409316e7723f0d99f1192d4c5f24d48ab5eed
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

12
patches/api/0001-Pufferfish-API-Changes.patch
View File

@@ -20,7 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. along with this program. If not, see <http://www.gnu.org/licenses/>.
diff --git a/build.gradle.kts b/build.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts
index e950bce5047552bdd3f5664eb24ce290b0a06225..10716b2c866631badb99b1fb79b66c62b117b038 100644 index 428e7777906aa5177c5c6489838e6400349bb62f..c873a0537186ebe8a0fe2d15c7a7950793fd9a37 100644
--- a/build.gradle.kts --- a/build.gradle.kts
+++ b/build.gradle.kts +++ b/build.gradle.kts
@@ -41,6 +41,7 @@ dependencies { @@ -41,6 +41,7 @@ dependencies {
@@ -476,7 +476,7 @@ index 8ff78fad47f6086aa289e32590f4fbec24b3d500..a16c841751bc44e46d27fc4efbfc2ab2
if (cloader instanceof PluginClassLoader) { if (cloader instanceof PluginClassLoader) {
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd13a50fe86 100644 index 06daf7e7b9f177256a7a15b91e72ff53f89ccb68..0011c228b10316b09a62579dfc3d37794ee8e61a 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -46,6 +46,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -46,6 +46,8 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
@@ -488,7 +488,7 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
static { static {
ClassLoader.registerAsParallelCapable(); ClassLoader.registerAsParallelCapable();
} }
@@ -172,6 +174,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -177,6 +179,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
throw new ClassNotFoundException(name); throw new ClassNotFoundException(name);
} }
@@ -496,7 +496,7 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
@Override @Override
protected Class<?> findClass(String name) throws ClassNotFoundException { protected Class<?> findClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) { if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
@@ -179,7 +182,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -184,7 +187,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
} }
Class<?> result = classes.get(name); Class<?> result = classes.get(name);
@@ -505,7 +505,7 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
String path = name.replace('.', '/').concat(".class"); String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path); JarEntry entry = jar.getJarEntry(path);
@@ -226,6 +229,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -231,6 +234,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
classes.put(name, result); classes.put(name, result);
} }
@@ -513,7 +513,7 @@ index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd1
return result; return result;
} }
@@ -234,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -239,6 +243,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
try { try {
super.close(); super.close();
} finally { } finally {