aboutsummaryrefslogtreecommitdiffhomepage
path: root/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch')
-rw-r--r--patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch b/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
index 2ef92033bd..e7f91ee16c 100644
--- a/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
+++ b/patches/server/0962-Fix-several-issues-with-EntityBreedEvent.patch
@@ -69,18 +69,18 @@ index 0297e234f17c6157cfff79420b9eeaf4e0e2c3ab..d683c49fdf2d1e5b0f2620641f9c241e
if (this.level().isClientSide || this.isSitting() || this.isInWater()) {
return InteractionResult.PASS;
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 5f879ec74cadc8b27f3c1648890978dbdc27f9f0..1f09d47b0ffb07b49b4d8bd79a371dd61f1c2a92 100644
+index 7860331b640fe48d1f2357d9f8e2e40c682b3620..84ae19bf9bddd2b6ee4737577d8836d59be028c2 100644
--- a/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
+++ b/src/main/java/net/minecraft/world/entity/animal/camel/Camel.java
-@@ -389,7 +389,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+@@ -398,7 +398,7 @@ public class Camel extends AbstractHorse implements PlayerRideableJumping, Saddl
+ boolean flag1 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
- boolean bl2 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
- if (bl2) {
+ if (flag1) {
- this.setInLove(player);
+ this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
}
- boolean bl3 = this.isBaby();
+ boolean flag2 = this.isBaby();
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
index 94dd97662ba07689fbfa16ef5c7d99fe12ce83de..815eb15086976b8f9e03bf8182d9ed50aec14720 100644
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java