Mirrors/Purpur
1
0
Fork 1
mirror of https://github.com/PurpurMC/Purpur.git synced 2026-02-17 16:37: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@ea777c3 Add a consumer parameter to ProjectileSource#launchProjectile (#8374)
PaperMC/Paper@470c638 Configurable chat thread limit (#7878)
PaperMC/Paper@dbc2d60 Make WorldCreator#keepSpawnLoaded return the WorldCreator (Fixes #8321) (#8371)
PaperMC/Paper@f8742e2 Also load resources from LibraryLoader (#8335)
PaperMC/Paper@f7e6809 Fix Pathfinding After World Has Changed (#8068)
PaperMC/Paper@ad3dffe Respect preventMovingIntoUnloadedChunks for optimized collision checking (#8259)
PaperMC/Paper@8db45c4 Copper clear on lightning strike calls EntityChangeBlockEvent (#8126)
This commit is contained in:
BillyGalbreath
2022-09-20 00:58:02 -05:00
parent f166b46032
commit aa349b9566
7 changed files with 19 additions and 19 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 = 63cb7472acb69d5a53bb806408d692e4df17cc32 paperCommit = 8db45c43121185f0e65cf31767ede2d79d2f4a65
org.gradle.caching = true org.gradle.caching = true
org.gradle.parallel = true org.gradle.parallel = true

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

@@ -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 345394132df70593800127d34a38f8f8a4dafe00..8f778e7d1b8508414ed47c6c6071cae9ebf2d986 100644 index f7cfe6c0d9d52ed72d0d45baaaf856c15769c668..2003a5fdf4cb3710f7b76ee435275cd13a50fe86 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 345394132df70593800127d34a38f8f8a4dafe00..8f778e7d1b8508414ed47c6c6071cae9
static { static {
ClassLoader.registerAsParallelCapable(); ClassLoader.registerAsParallelCapable();
} }
@@ -151,6 +153,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -172,6 +174,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
throw new ClassNotFoundException(name); throw new ClassNotFoundException(name);
} }
@@ -496,7 +496,7 @@ index 345394132df70593800127d34a38f8f8a4dafe00..8f778e7d1b8508414ed47c6c6071cae9
@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.")) {
@@ -158,7 +161,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -179,7 +182,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
} }
Class<?> result = classes.get(name); Class<?> result = classes.get(name);
@@ -505,7 +505,7 @@ index 345394132df70593800127d34a38f8f8a4dafe00..8f778e7d1b8508414ed47c6c6071cae9
String path = name.replace('.', '/').concat(".class"); String path = name.replace('.', '/').concat(".class");
JarEntry entry = jar.getJarEntry(path); JarEntry entry = jar.getJarEntry(path);
@@ -205,6 +208,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -226,6 +229,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
classes.put(name, result); classes.put(name, result);
} }
@@ -513,7 +513,7 @@ index 345394132df70593800127d34a38f8f8a4dafe00..8f778e7d1b8508414ed47c6c6071cae9
return result; return result;
} }
@@ -213,6 +217,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot @@ -234,6 +238,7 @@ public final class PluginClassLoader extends URLClassLoader { // Spigot
try { try {
super.close(); super.close();
} finally { } finally {

4
patches/server/0003-Rebrand.patch
View File

@@ -271,10 +271,10 @@ index 4e56018b64d11f76c8da43fd8f85c6de72204e36..aa8212432825db65cf485cd93f734ccd
@Override @Override
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 1994dd3c272395a27474ec1b37a924a24fc50fd6..778c3f9fe4f7cff450e2bb75ae9d8414af772cd4 100644 index e807ef287136e7b3931197e45434a3f618cf3054..2b68a138ae7e8b74b7dcc983e593aa6a2d149f76 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -854,7 +854,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -866,7 +866,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
return EntityCategory.WATER; return EntityCategory.WATER;
} }

6
patches/server/0015-LivingEntity-safeFallDistance.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] LivingEntity safeFallDistance
diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java diff --git a/src/main/java/net/minecraft/world/entity/LivingEntity.java b/src/main/java/net/minecraft/world/entity/LivingEntity.java
index 8f9c23969aec0fb101f5532976b07106878499fe..57960731e7bf6abb8a5db875f71f4de312180574 100644 index dbf1ef9297efd628f8479c63217919d179418295..4dbe0ed1a9bfd97450cb28ba2d105c25d1416c6a 100644
--- a/src/main/java/net/minecraft/world/entity/LivingEntity.java --- a/src/main/java/net/minecraft/world/entity/LivingEntity.java
+++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java +++ b/src/main/java/net/minecraft/world/entity/LivingEntity.java
@@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity { @@ -255,6 +255,7 @@ public abstract class LivingEntity extends Entity {
@@ -62,10 +62,10 @@ index 8b1942b396606f0c989645a6ac587fbdd26a3dc5..c1c5e884f00398032196ee71b55b348f
// Purpur start // Purpur start
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 778c3f9fe4f7cff450e2bb75ae9d8414af772cd4..dca22c93c6743a5f14ba33541a45f34059978b61 100644 index 2b68a138ae7e8b74b7dcc983e593aa6a2d149f76..98ccc3a215e2d4c16cf9b3207aa6ab5d5edbc378 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -966,4 +966,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -978,4 +978,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category"); throw new IllegalArgumentException(entityCategory + " is an unrecognized entity category");
} }
// Paper end // Paper end

4
patches/server/0094-LivingEntity-broadcastItemBreak.patch
View File

@@ -5,10 +5,10 @@ Subject: [PATCH] LivingEntity#broadcastItemBreak
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index dca22c93c6743a5f14ba33541a45f34059978b61..5188830602225f072995692098fbcb8222067935 100644 index 98ccc3a215e2d4c16cf9b3207aa6ab5d5edbc378..b211a2398aefe30ce1f344df11585ce78dcfc390 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -977,5 +977,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -989,5 +989,11 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
public void setSafeFallDistance(float safeFallDistance) { public void setSafeFallDistance(float safeFallDistance) {
getHandle().safeFallDistance = safeFallDistance; getHandle().safeFallDistance = safeFallDistance;
} }

6
patches/server/0183-API-for-any-mob-to-burn-daylight.patch
View File

@@ -6,7 +6,7 @@ Subject: [PATCH] API for any mob to burn daylight
Co-authored by: Encode42 <me@encode42.dev> Co-authored by: Encode42 <me@encode42.dev>
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index 8d97593403198941ff6775dd8576a0e4ea8eb83e..4e5b2704f22ac8e94c8ec3b7bfe1e755207eb8cb 100644 index e9a931ce31257ad1a29c15d1619e5f80865f151b..9af78fde6b4d75cf7656c575b98e1e174f599e22 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -4611,5 +4611,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -4611,5 +4611,20 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -367,10 +367,10 @@ index 7bca861c3ebfc7550b82ae74483464b11f8d6b55..b6e0d832a5685fd6105c5307015d58a2
/* /*
* Order is *EXTREMELY* important -- keep it right! =D * Order is *EXTREMELY* important -- keep it right! =D
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
index 5188830602225f072995692098fbcb8222067935..99130bd07607b54fb7c2a40f43d5d96bd81b56fd 100644 index b211a2398aefe30ce1f344df11585ce78dcfc390..9076717d7c517b9cb349bcf044b5bfa355267585 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
@@ -983,5 +983,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { @@ -995,5 +995,15 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
if (slot == null) return; if (slot == null) return;
getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot)); getHandle().broadcastBreakEvent(org.bukkit.craftbukkit.CraftEquipmentSlot.getNMS(slot));
} }

6
patches/server/0243-Option-to-prevent-spiders-from-climbing-world-border.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Option to prevent spiders from climbing world border
diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java diff --git a/src/main/java/net/minecraft/world/entity/Entity.java b/src/main/java/net/minecraft/world/entity/Entity.java
index ebe13267573fbf04d11143a6fcbed3d1a8b2ee5d..39d3320f608e3c35d52e81bac626f1d166a3adcd 100644 index 78297c4d2469bb85d3b4aecc683eadb3c2bef54f..873b26b4505708ca0423e797678b732be905e81f 100644
--- a/src/main/java/net/minecraft/world/entity/Entity.java --- a/src/main/java/net/minecraft/world/entity/Entity.java
+++ b/src/main/java/net/minecraft/world/entity/Entity.java +++ b/src/main/java/net/minecraft/world/entity/Entity.java
@@ -305,6 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -305,6 +305,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
@@ -17,7 +17,7 @@ index ebe13267573fbf04d11143a6fcbed3d1a8b2ee5d..39d3320f608e3c35d52e81bac626f1d1
protected Vec3 stuckSpeedMultiplier; protected Vec3 stuckSpeedMultiplier;
@Nullable @Nullable
@@ -1416,7 +1417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource { @@ -1416,7 +1417,7 @@ public abstract class Entity implements Nameable, EntityAccess, CommandSource {
io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, true, io.papermc.paper.util.CollisionUtil.getCollisions(world, this, collisionBox, potentialCollisions, false, this.level.paperConfig().chunks.preventMovingIntoUnloadedChunks,
false, false, null, null); false, false, null, null);
- if (io.papermc.paper.util.CollisionUtil.isCollidingWithBorderEdge(world.getWorldBorder(), collisionBox)) { - if (io.papermc.paper.util.CollisionUtil.isCollidingWithBorderEdge(world.getWorldBorder(), collisionBox)) {
@@ -39,7 +39,7 @@ index bdd4fc3072f7a5ea504ba35f6a08ae971e83b69f..b9ac8cefefe1f47548166330b7c889df
} }
diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java diff --git a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
index 40e54a9d0bdd8e155eae9086facbe8cd7fd261bc..452bb5070347251a3e53fef82872b8c5bd990d03 100644 index a3ae2516fd7b7828fcd5bf927ee7c6ec17aea8a3..603889d0d34f8c9142832b563a22a213629d01c2 100644
--- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java --- a/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
+++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java +++ b/src/main/java/org/purpurmc/purpur/PurpurWorldConfig.java
@@ -2488,6 +2488,7 @@ public class PurpurWorldConfig { @@ -2488,6 +2488,7 @@ public class PurpurWorldConfig {