Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
PaperMC/Paper@dfc38843 deprecate bubble column methods
PaperMC/Paper@480b2ed0 use more specific codecs in click event actions
PaperMC/Paper@e21bf450 fix chunk-gc plugin ticket config
PaperMC/Paper@32fef5d2 do the fix in Ticket record getter instead
PaperMC/Paper@0d8dad65 Quick cursory update of ItemStackDataComponentTest
PaperMC/Paper@0f1f084b Update ItemStackDataComponentEqualsTest
PaperMC/Paper@34dfd5e8 add perm for test command, fix some tests
PaperMC/Paper@740abe1a Update CraftSmithingTransformRecipe
PaperMC/Paper@de93fda5 Merge branch 'update/1.21.5' of github.com:PaperMC/Paper into update/1.21.5
PaperMC/Paper@c02ad46d Update SmithingTripRecipe
PaperMC/Paper@0a5ea70a Also bundle mc source change from last commit
PaperMC/Paper@e7534177 Some marginal work on DataComponents
PaperMC/Paper@db35db76 Implement legacy custom biome
PaperMC/Paper@18b06e38 Implement plugin tickets
PaperMC/Paper@c7b22702 Implement custom legacy biome
PaperMC/Paper@77f07c89 Call drop events for dropping items
PaperMC/Paper@eac69a96 Pray my thesis is better than this
PaperMC/Paper@c5231f91 Update to 1.21.5
PaperMC/Paper@a3f71b0f update some magic values
PaperMC/Paper@704cc38c Add some missing adapters
PaperMC/Paper@536b9b4b fix some more tests
PaperMC/Paper@985ebcfe Quick handling for ChickenVariant data component, remove dupe
PaperMC/Paper@39eafa2a implement wolf sound variants
PaperMC/Paper@c78f5631 make class node tests have a display name
PaperMC/Paper@3be8a83c Allow picking items from inventory
PaperMC/Paper@95beb8c0 register wolf sound variant
This commit is contained in:
granny
2025-03-25 22:20:43 -07:00
parent 9dc9fd34cd
commit 110b3a7813
8 changed files with 28 additions and 28 deletions

View File

@@ -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 227a2cdc6dbca17d4771aff3a0f62c424c4b06c9..65c4c0690874c29814098448b6cc6077a1e8c566 100644
index 1a4f42c9e6012a6a074c9d5451d8dc11530a5c5b..67b9963afd91af84459d439697f6230fd67722b4 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1295,4 +1295,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -1275,4 +1275,27 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
((CraftPlayer) player).sendHurtAnimation(0, this);
}
}
@@ -37,7 +37,7 @@ index 227a2cdc6dbca17d4771aff3a0f62c424c4b06c9..65c4c0690874c29814098448b6cc6077
+ // 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 797d731f97c3457d504be5d81e233e3d63f993f6..6f112d700a368a64acca8d702d03ef93942da963 100644
index a7e3afe04ffbb0fd5fa5fcf7cd15efd7cea1c4e0..9c88a5b6b054636a9f326d0253f65496cf3babc3 100644
--- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
+++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -514,6 +514,15 @@ public class CraftEventFactory {