Updated Upstream (Paper)
Upstream has released updates that appear to apply and compile correctly Paper Changes: PaperMC/Paper@a172880 Update ForgeFlower to 2.0.627.2, fixes dev bundle not applying with Java 19 runtime PaperMC/Paper@4151f75 /paper entity list QOL improvements (#8876) PaperMC/Paper@8a815a0 Fix rendering for translatable death messages (#8534) PaperMC/Paper@d30cda1 Add TeleportFlags (#8855) PaperMC/Paper@3dcf4e4 Add EntityFertilizeEggEvent (#8041) PaperMC/Paper@f2075c4 Take in account waterlogged block for the event (#8623) PaperMC/Paper@e5e75dd Include previous spawn angle in SpawnChangeEvent (#8606) PaperMC/Paper@541753b Fix HumanEntity#drop not updating the client inventory (#6761) PaperMC/Paper@75280ef Fix cancelling EntityDeathEvent for Armor Stands killed by players (#6478) PaperMC/Paper@6f57163 Add CompostItemEvent and EntityCompostItemEvent (#6356) PaperMC/Paper@5cc78f2 Use configured log prefix for spigot library loading (#7934) PaperMC/Paper@27c0503 Correctly handle ArmorStand invisibility (#8944) PaperMC/Paper@bf2053a Fix Player#setPlayerProfile (#8939) PaperMC/Paper@4d7269e Correctly Remove Classloaders, Avoid Loading Providers in /paper dumpplugins, Fix library lookup (#8938) PaperMC/Paper@4e99466 Updated Upstream (Bukkit/CraftBukkit/Spigot) (#8874) PaperMC/Paper@18470db Fix getTargetEntity not targeting creative players (#8960) PaperMC/Paper@155aa36 Properly handle load before plugins in legacy loading (#8962)
This commit is contained in:
5 files changed
+16
-16
No files matched your search
+1
-1
@@ -5,4 +5,4 @@ org.gradle.vfs.watch=false
|
||||
group=gg.pufferfish.pufferfish
|
||||
version=1.19.3-R0.1-SNAPSHOT
|
||||
mcVersion=1.19.3
|
||||
paperRef=e57441254dc93fa70782c10f9a22c87dc98ca0b6
|
||||
paperRef=155aa36d89b260ef5841615899299756b5983c0a
|
||||
@@ -5,7 +5,7 @@ Subject: [PATCH] Add Sentry
|
||||
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 7ba2b08b8c5eb405a64f9edfa72195dcf48f82bd..84850d8135f7b998b4cf602ab7ec9b6dc65ac329 100644
|
||||
index 9421e45653e68922a51cf0071792e6fa7999d0b8..b385787e126ffd2563f02d8876780e6e0fc68ca3 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -41,6 +41,7 @@ dependencies {
|
||||
@@ -14,8 +14,8 @@ index 7ba2b08b8c5eb405a64f9edfa72195dcf48f82bd..84850d8135f7b998b4cf602ab7ec9b6d
|
||||
api("org.slf4j:slf4j-api:1.8.0-beta4")
|
||||
+ api("io.sentry:sentry:5.4.0") // Pufferfish
|
||||
|
||||
implementation("org.ow2.asm:asm:9.2")
|
||||
implementation("org.ow2.asm:asm-commons:9.2")
|
||||
implementation("org.ow2.asm:asm:9.4")
|
||||
implementation("org.ow2.asm:asm-commons:9.4")
|
||||
diff --git a/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java b/src/main/java/gg/pufferfish/pufferfish/sentry/SentryContext.java
|
||||
new file mode 100644
|
||||
index 0000000000000000000000000000000000000000..10310fdd53de28efb8a8250f6d3b0c8eb08fb68a
|
||||
@@ -210,7 +210,7 @@ index 2b8308989fce7f8a16907f8711b362e671fdbfb6..bd4d1a40f53784662174d426533ef4b5
|
||||
callEvent(new com.destroystokyo.paper.event.server.ServerExceptionEvent(new com.destroystokyo.paper.exception.ServerEventException(msg, ex, registration.getPlugin(), registration.getListener(), event)));
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
index 88d852c1a729ffd5951da803da424b31591c9f9a..f0da30d0bf41243ba16c936cc89c7533d9f0e29d 100644
|
||||
index eaefbb00e9993d54906cc8cf35cf753c0d6c7707..301e82369603f3dd6e6c1bd380da4bacacd7ef6c 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||||
@@ -336,7 +336,13 @@ public final class JavaPluginLoader implements PluginLoader {
|
||||
|
||||
@@ -5,10 +5,10 @@ Subject: [PATCH] Expose findClass for profiler
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
index e89ab347b908cc92274dd5dd796a02249f899977..a4c481e5284cc2ab7e9fb6fb0368267827dd3c85 100644
|
||||
index 86771934c76dd63b219069b045dbb5511ee0f45d..12bd25cfcefbb66f0d686ba9e344b7a71b30f4dc 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
@@ -181,6 +181,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
@@ -183,6 +183,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
throw new ClassNotFoundException(name);
|
||||
}
|
||||
|
||||
|
||||
@@ -5,19 +5,19 @@ Subject: [PATCH] Ignore lookups if closed
|
||||
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
index a4c481e5284cc2ab7e9fb6fb0368267827dd3c85..7329d2f27f3c2f89bb8f78771872472ec8b6bc22 100644
|
||||
index 12bd25cfcefbb66f0d686ba9e344b7a71b30f4dc..24ab015fbab6ce789999872791f7ffe4cc64d6d6 100644
|
||||
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
|
||||
@@ -47,6 +47,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
private java.util.logging.Logger logger; // Paper - add field
|
||||
@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
|
||||
public io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext; // Paper
|
||||
|
||||
+ private boolean closed = false; // Pufferfish
|
||||
+
|
||||
static {
|
||||
ClassLoader.registerAsParallelCapable();
|
||||
}
|
||||
@@ -189,7 +191,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
@@ -191,7 +193,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
}
|
||||
Class<?> result = classes.get(name);
|
||||
|
||||
@@ -26,7 +26,7 @@ index a4c481e5284cc2ab7e9fb6fb0368267827dd3c85..7329d2f27f3c2f89bb8f78771872472e
|
||||
String path = name.replace('.', '/').concat(".class");
|
||||
JarEntry entry = jar.getJarEntry(path);
|
||||
|
||||
@@ -236,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
@@ -238,6 +240,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
this.setClass(name, result); // Paper
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ index a4c481e5284cc2ab7e9fb6fb0368267827dd3c85..7329d2f27f3c2f89bb8f78771872472e
|
||||
return result;
|
||||
}
|
||||
|
||||
@@ -250,6 +253,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
@@ -252,6 +255,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
|
||||
// Paper end
|
||||
super.close();
|
||||
} finally {
|
||||
|
||||
@@ -6,7 +6,7 @@ Subject: [PATCH] Pufferfish branding
|
||||
Update branding
|
||||
|
||||
diff --git a/build.gradle.kts b/build.gradle.kts
|
||||
index 4cc7d15f43b2547a723ea231bcf98bc13bdb85bf..536a7e2c0a9001a707f3276895fd4463b03f79cb 100644
|
||||
index 1919a8e9cb7c995b2a9c876ff4980bdc98977133..70316602339c9676fbb9f631214473c6e845d7f4 100644
|
||||
--- a/build.gradle.kts
|
||||
+++ b/build.gradle.kts
|
||||
@@ -7,8 +7,12 @@ plugins {
|
||||
@@ -230,10 +230,10 @@ index bbb8335dae0a3e2761e6bbb8dc723bcf28cd82ba..1a114d326463a37ae78b6e2034a3d9b6
|
||||
private final String bukkitVersion = Versioning.getBukkitVersion();
|
||||
private final Logger logger = Logger.getLogger("Minecraft");
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
index 1244c1ca5e0907298b1ca6de538db82b2209ec4d..6aa2121e286dd6d43201a38722ea0cdd205baaa7 100644
|
||||
index 81ffcca62c2ebb15889d286bfe9138b86ccfe71e..0ccde7fe2a852f7da72f0b3f5a53cb48d28d1840 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
|
||||
@@ -468,7 +468,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
||||
@@ -464,7 +464,7 @@ public final class CraftMagicNumbers implements UnsafeValues {
|
||||
|
||||
@Override
|
||||
public com.destroystokyo.paper.util.VersionFetcher getVersionFetcher() {
|
||||
|
||||
Reference in new issue
Block a user