aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch')
-rw-r--r--patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch15
1 files changed, 15 insertions, 0 deletions
diff --git a/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
index dfc2aa7485..872b3ba687 100644
--- a/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0930-Fix-several-issues-with-EntityBreedEvent.patch
@@ -68,6 +68,21 @@ index 0440fd2d1bb3f87641ad88de6d5ae64617536a6d..db60b91c2b26ca8cdb66e05deab7742f
} else {
if (this.level().isClientSide || this.isSitting() || this.isInWater()) {
return InteractionResult.PASS;
+diff --git a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+index 4e38bed2a450e90a416bfc03e4231b95f67133ea..b38281f963377cc82b360e8457da7cad033b8c36 100644
+--- a/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
++++ b/src/main/java/net/minecraft/world/entity/animal/armadillo/Armadillo.java
+@@ -351,8 +351,8 @@ public class Armadillo extends Animal {
+ }
+
+ @Override
+- public void setInLove(@Nullable Player player) {
+- super.setInLove(player);
++ public void setInLove(@Nullable Player player, @Nullable ItemStack breedItemCopy) { // Paper
++ super.setInLove(player, breedItemCopy); // Paper
+ this.makeSound(SoundEvents.ARMADILLO_EAT);
+ }
+
diff --git a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
index 8ebe18a1abbac81094e6aab19ba76edc0255e3b7..4eb26874f21726bbc6e6ad78bfaf4ecd268c7246 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java