From dacf6b0d069f46b43cb3dd40082bac7916ef8084 Mon Sep 17 00:00:00 2001 From: granny Date: Thu, 27 Nov 2025 00:03:59 -0800 Subject: [PATCH] apply paper server feature patches --- .../0001-Rebrand.patch | 0 .../0002-Ridables.patch | 10 +++++----- .../0003-Barrels-and-enderchests-6-rows.patch | 0 .../0004-Add-EntityTeleportHinderedEvent.patch | 4 ++-- .../0005-API-for-any-mob-to-burn-daylight.patch | 6 +++--- 5 files changed, 10 insertions(+), 10 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-Add-EntityTeleportHinderedEvent.patch (91%) rename purpur-server/paper-patches/{unapplied-features => features}/0005-API-for-any-mob-to-burn-daylight.patch (91%) 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 4f3500a26..a4a5ff225 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 bf3674f8984dd0ee441e04f92b747f908d629953..132e045f3885146a9a6510c6ed51fcb85e1c47ce 100644 +index 2f940ec42f4d657e40f4da1d974f46c87837a48c..da588e4622aac635ecc2205ea09ceb9722cd59c9 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -1342,4 +1342,26 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -1343,4 +1343,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 bf3674f8984dd0ee441e04f92b747f908d629953..132e045f3885146a9a6510c6ed51fcb8 + // 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 d5496e5fbb5fcd65df2933ebc7cb39df7d832923..09ef508247d98645591283d91a9beba90d1df7d5 100644 +index b950465debc2ec2551dd862302bf196f9339a412..2fbd7aa65b3808253297f0982692c05bfe53b44c 100644 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java -@@ -521,6 +521,15 @@ public class CraftEventFactory { +@@ -653,6 +653,15 @@ public class CraftEventFactory { } craftServer.getPluginManager().callEvent(event); @@ -55,7 +55,7 @@ index d5496e5fbb5fcd65df2933ebc7cb39df7d832923..09ef508247d98645591283d91a9beba9 return event; } -@@ -1043,6 +1052,7 @@ public class CraftEventFactory { +@@ -1175,6 +1184,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-Add-EntityTeleportHinderedEvent.patch b/purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch similarity index 91% rename from purpur-server/paper-patches/unapplied-features/0004-Add-EntityTeleportHinderedEvent.patch rename to purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch index 6548cc5e4..d14438b50 100644 --- a/purpur-server/paper-patches/unapplied-features/0004-Add-EntityTeleportHinderedEvent.patch +++ b/purpur-server/paper-patches/features/0004-Add-EntityTeleportHinderedEvent.patch @@ -17,10 +17,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -index 29c08d097b487b177426ec2ea78f8fe79d987bdc..b615c03d73071c923e0a3d1123810e110419318b 100644 +index 047bac50db20918ea71f5ccc0ec8c814647bdcde..8bee90c2757698249997520d8a9fe085aa0ee0a4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java -@@ -1390,6 +1390,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa +@@ -1392,6 +1392,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player, PluginMessa // Minecraft does not currently support teleporting players between worlds with passengers. // It causes them to be dismounted, and causes weird behavior. if (location.getWorld() != this.getWorld() && !this.getHandle().passengers.isEmpty()) { diff --git a/purpur-server/paper-patches/unapplied-features/0005-API-for-any-mob-to-burn-daylight.patch b/purpur-server/paper-patches/features/0005-API-for-any-mob-to-burn-daylight.patch similarity index 91% rename from purpur-server/paper-patches/unapplied-features/0005-API-for-any-mob-to-burn-daylight.patch rename to purpur-server/paper-patches/features/0005-API-for-any-mob-to-burn-daylight.patch index 4615615b8..41d99e777 100644 --- a/purpur-server/paper-patches/unapplied-features/0005-API-for-any-mob-to-burn-daylight.patch +++ b/purpur-server/paper-patches/features/0005-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 132e045f3885146a9a6510c6ed51fcb85e1c47ce..6ac0f9d208c41182b7c596ab809de41f07f265a9 100644 +index da588e4622aac635ecc2205ea09ceb9722cd59c9..d04ff11b293c458fd4f18f04336421e5e183c3f4 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java -@@ -125,6 +125,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { +@@ -126,6 +126,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } // Purpur end - Fire Immunity API @@ -24,7 +24,7 @@ index 132e045f3885146a9a6510c6ed51fcb85e1c47ce..6ac0f9d208c41182b7c596ab809de41f 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 3feb3ee939ce3814aec289841bae7f928893b83e..a0f514ed2ddf450a78811bc918a594c30e759081 100644 +index d9129420acaf992c36e171d1b6d399a4b322fea6..d64c10a86a63dac5ce9babcd826e2ecc83b08423 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java @@ -1088,4 +1088,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {