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

@@ -1,6 +1,6 @@
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
@@ -1193,4 +_,59 @@
@@ -1214,4 +_,59 @@
*/
void broadcastHurtAnimation(@NotNull java.util.Collection<Player> players);
// Paper end - broadcast hurt animation

View File

@@ -1,7 +1,7 @@
--- a/src/main/java/org/bukkit/entity/Wolf.java
+++ b/src/main/java/org/bukkit/entity/Wolf.java
@@ -110,4 +_,20 @@
return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_VARIANT).getOrThrow(NamespacedKey.minecraft(key));
@@ -138,4 +_,20 @@
return RegistryAccess.registryAccess().getRegistry(RegistryKey.WOLF_SOUND_VARIANT).getOrThrow(NamespacedKey.minecraft(key));
}
}
+
@@ -11,13 +11,13 @@
+ *
+ * @return whether the wolf is rabid
+ */
+ public boolean isRabid();
+ boolean isRabid();
+
+ /**
+ * Sets this wolf to be rabid or not
+ *
+ * @param rabid whether the wolf should be rabid
+ */
+ public void setRabid(boolean rabid);
+ void setRabid(boolean rabid);
+ // Purpur end
}