From b4d87ec1dc7c29038ead571875c2b6b837100766 Mon Sep 17 00:00:00 2001 From: granny Date: Mon, 8 Jun 2026 10:16:24 -0700 Subject: [PATCH] apply paper server feature patches --- .../0001-Rebrand.patch | 0 .../0002-Ridables.patch | 10 +++++----- .../0003-Barrels-and-enderchests-6-rows.patch | 0 .../0004-API-for-any-mob-to-burn-daylight.patch | 6 +++--- .../0005-Setting-to-reintroduce-end-void-rings.patch | 0 5 files changed, 8 insertions(+), 8 deletions(-) rename purpur-server/paper-patches/{unapplied-features => features}/0001-Rebrand.patch (100%) rename purpur-server/paper-patches/{unapplied-features => features}/0002-Ridables.patch (87%) rename purpur-server/paper-patches/{unapplied-features => features}/0003-Barrels-and-enderchests-6-rows.patch (100%) rename purpur-server/paper-patches/{unapplied-features => features}/0004-API-for-any-mob-to-burn-daylight.patch (91%) rename purpur-server/paper-patches/{unapplied-features => features}/0005-Setting-to-reintroduce-end-void-rings.patch (100%) diff --git a/purpur-server/paper-patches/unapplied-features/0001-Rebrand.patch b/purpur-server/paper-patches/features/0001-Rebrand.patch similarity index 100% rename from purpur-server/paper-patches/unapplied-features/0001-Rebrand.patch rename to purpur-server/paper-patches/features/0001-Rebrand.patch diff --git a/purpur-server/paper-patches/unapplied-features/0002-Ridables.patch b/purpur-server/paper-patches/features/0002-Ridables.patch similarity index 87% rename from purpur-server/paper-patches/unapplied-features/0002-Ridables.patch rename to purpur-server/paper-patches/features/0002-Ridables.patch index 59c16429a..82ff7bee1 100644 --- a/purpur-server/paper-patches/unapplied-features/0002-Ridables.patch +++ b/purpur-server/paper-patches/features/0002-Ridables.patch @@ -5,10 +5,10 @@ Subject: [PATCH] Ridables diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index c5a866735d7d918ea58306ea2299a8b82be52f3f..d6ddbcff911ce4c97a20883af10d2b4752b63f55 100644 +index de6fe0b783a145f6571bf73665e7107430f22592..612e3457d537d6129437443753cad3e48590d542 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1343,4 +1343,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1344,4 +1344,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { return this.entity.get(io.papermc.paper.datacomponent.PaperDataComponentType.bukkitToMinecraft(type)) != null; } @@ -36,10 +36,10 @@ index c5a866735d7d918ea58306ea2299a8b82be52f3f..d6ddbcff911ce4c97a20883af10d2b47 + // Purpur end - Ridables } diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -index 7a42d1810f74a041318c8a3c53793106e872081f..6c4045b842a23caa2f3f1e52cb0130a97ffc2682 100644 +index 6dd60f8a3c322671a3c91e7239d6218e4724bc71..6c78b4b24d43712ae98bbc1e2c3f2e896da57fb4 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -652,6 +652,15 @@ public class CraftEventFactory { +@@ -653,6 +653,15 @@ public class CraftEventFactory { } craftServer.getPluginManager().callEvent(event); @@ -55,7 +55,7 @@ index 7a42d1810f74a041318c8a3c53793106e872081f..6c4045b842a23caa2f3f1e52cb0130a9 return event; } -@@ -1164,6 +1173,7 @@ public class CraftEventFactory { +@@ -1158,6 +1167,7 @@ public class CraftEventFactory { EntityDamageEvent event; if (damager != null) { event = new EntityDamageByEntityEvent(damager.getBukkitEntity(), damagee.getBukkitEntity(), cause, bukkitDamageSource, modifiers, modifierFunctions, critical); diff --git a/purpur-server/paper-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch b/purpur-server/paper-patches/features/0003-Barrels-and-enderchests-6-rows.patch similarity index 100% rename from purpur-server/paper-patches/unapplied-features/0003-Barrels-and-enderchests-6-rows.patch rename to purpur-server/paper-patches/features/0003-Barrels-and-enderchests-6-rows.patch diff --git a/purpur-server/paper-patches/unapplied-features/0004-API-for-any-mob-to-burn-daylight.patch b/purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch similarity index 91% rename from purpur-server/paper-patches/unapplied-features/0004-API-for-any-mob-to-burn-daylight.patch rename to purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch index ecbf2fdef..05b03ef8f 100644 --- a/purpur-server/paper-patches/unapplied-features/0004-API-for-any-mob-to-burn-daylight.patch +++ b/purpur-server/paper-patches/features/0004-API-for-any-mob-to-burn-daylight.patch @@ -6,10 +6,10 @@ Subject: [PATCH] API for any mob to burn daylight Co-authored by: Encode42 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -index d6ddbcff911ce4c97a20883af10d2b4752b63f55..7db0454a8c9251faa815500c307d116b9303b236 100644 +index 612e3457d537d6129437443753cad3e48590d542..a188eb750d6371f7e550a8971135a81de5823032 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -126,6 +126,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -127,6 +127,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } // Purpur end - Fire Immunity API @@ -24,7 +24,7 @@ index d6ddbcff911ce4c97a20883af10d2b4752b63f55..7db0454a8c9251faa815500c307d116b Preconditions.checkArgument(entity != null, "Unknown entity"); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java -index f7cb449ae4884e43eda61951443aa7a15dbf4341..327900d58d2c77099a86bf05592d839ed3d14ea3 100644 +index 86ea370201a3c92f70289ca197adcb69130b53cb..b7b82bf44c164123dd62a690421001b110b68af8 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1141,4 +1141,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity { diff --git a/purpur-server/paper-patches/unapplied-features/0005-Setting-to-reintroduce-end-void-rings.patch b/purpur-server/paper-patches/features/0005-Setting-to-reintroduce-end-void-rings.patch similarity index 100% rename from purpur-server/paper-patches/unapplied-features/0005-Setting-to-reintroduce-end-void-rings.patch rename to purpur-server/paper-patches/features/0005-Setting-to-reintroduce-end-void-rings.patch