mirror/Purpur
2
0
Fork 0
mirror of https://github.com/PurpurMC/Purpur.git synced 2025-02-17 13:00:04 +08: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@d9699b5 Configure mokitor Server mock as stubOnly (#8861)
PaperMC/Paper@8b37e9e update alternate current to v1.5.0 (#8882)
PaperMC/Paper@ddc0a99 Further clarify functionality of damageItemStack methods (#8878)
PaperMC/Paper@bb63a61 Fix JavaPlugin static getPlugin methods (#8888)
This commit is contained in:
granny 2023-02-21 23:05:26 -08:00
parent 0f3bbcbbbf
commit 9698422af2
No known key found for this signature in database
5 changed files with 13 additions and 13 deletions
Show Stats 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
version = 1.19.3-R0.1-SNAPSHOT
paperCommit = 8427c889879576f351cd10301dff37b8354b4d00
paperCommit = bb63a6156d9f6c5d6ab018224934a3f5fbb29a89
org.gradle.caching = true
org.gradle.parallel = true

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

@ -476,10 +476,10 @@ index 9a54f5bde27f1b77fd7b831100cb4e71d8ce4e29..6d91420290a1700d14d3932ab0d030ee
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
index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd6635678763f3142a6 100644
index 7d300a539ac2ef1c773cfa90cecc8655490a8686..edc8e4b071c28a608d9f34cbc8e5b0fb7178e396 100644
--- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
@@ -48,6 +48,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -47,6 +47,8 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
private java.util.logging.Logger logger; // Paper - add field
private io.papermc.paper.plugin.provider.classloader.PluginClassLoaderGroup classLoaderGroup; // Paper
@ -488,7 +488,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
static {
ClassLoader.registerAsParallelCapable();
}
@@ -177,6 +179,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -181,6 +183,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
throw new ClassNotFoundException(name);
}
@ -496,7 +496,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
@Override
protected Class<?> findClass(String name) throws ClassNotFoundException {
if (name.startsWith("org.bukkit.") || name.startsWith("net.minecraft.")) {
@@ -184,7 +187,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -188,7 +191,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
}
Class<?> result = classes.get(name);
@ -505,7 +505,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path);
@@ -231,6 +234,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -235,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
this.setClass(name, result); // Paper
}
@ -513,7 +513,7 @@ index 4666d29d27e6247422a94e99511a190ce9484f76..022c094efa45959a058e0cd663567876
return result;
}
@@ -245,6 +249,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
@@ -249,6 +253,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
// Paper end
super.close();
} finally {

4
patches/api/0013-LivingEntity-safeFallDistance.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 1da1c293ac8a13d22743c26d35624155bfa73a16..df181fc97e56fcde382235cb1262d65b9bb9ff85 100644
index d045f41d929c6101060caf3a9fb48c8ffc036f16..7bd859e8682af7c66e604c952a885328838baeb0 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1142,4 +1142,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1146,4 +1146,20 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
*/
void setBodyYaw(float bodyYaw);
// Paper end

4
patches/api/0022-LivingEntity-broadcastItemBreak.patch
View File

@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index df181fc97e56fcde382235cb1262d65b9bb9ff85..5957c30607fdb202c5400b6b2513692126fa76b5 100644
index 7bd859e8682af7c66e604c952a885328838baeb0..f9ccc652c3e1d8e7eb68397d22ca75e040dcb43f 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1157,5 +1157,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1161,5 +1161,12 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param safeFallDistance Safe fall distance
*/
void setSafeFallDistance(float safeFallDistance);

4
patches/api/0032-API-for-any-mob-to-burn-daylight.patch
View File

@ -23,10 +23,10 @@ index 56afcc92854897ad5c971e576f96414bae766b7a..d8f30fca0b5b9673c5dd8a78e87a378c
// Purpur end
}
diff --git a/src/main/java/org/bukkit/entity/LivingEntity.java b/src/main/java/org/bukkit/entity/LivingEntity.java
index 5957c30607fdb202c5400b6b2513692126fa76b5..127bf9621cca12327ac06becdd921a5f843b888d 100644
index f9ccc652c3e1d8e7eb68397d22ca75e040dcb43f..44246068b51e47342d767f15af6881f29461589c 100644
--- a/src/main/java/org/bukkit/entity/LivingEntity.java
+++ b/src/main/java/org/bukkit/entity/LivingEntity.java
@@ -1164,5 +1164,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
@@ -1168,5 +1168,19 @@ public interface LivingEntity extends Attributable, Damageable, ProjectileSource
* @param slot Equipment slot to play break animation for
*/
void broadcastItemBreak(@NotNull org.bukkit.inventory.EquipmentSlot slot);