2023-11-12 00:23:02 +01:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Thu, 15 Dec 2022 00:14:44 -0800
|
|
|
|
Subject: [PATCH] Fix several issues with EntityBreedEvent
|
|
|
|
|
|
|
|
Upstream did not account for different hands when storing
|
|
|
|
the breed item for later use in the event. Also they only
|
|
|
|
stored a reference to the stack, not a copy so if the stack
|
|
|
|
changed after love mode was started, the breed item in the event
|
|
|
|
also changed. Also in several places, the breed item was stored after
|
|
|
|
it was decreased by one to consume the item.
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Animal.java b/src/main/java/net/minecraft/world/entity/animal/Animal.java
|
2024-01-13 18:34:33 +01:00
|
|
|
index 907ed82fea71254d6624eda878e2668cd26422a7..081d1e38b7b1f286e138b0981aaa760e58761215 100644
|
2023-11-12 00:23:02 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Animal.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Animal.java
|
2023-12-06 19:18:53 +01:00
|
|
|
@@ -152,8 +152,9 @@ public abstract class Animal extends AgeableMob {
|
2023-11-12 00:23:02 +01:00
|
|
|
int i = this.getAge();
|
|
|
|
|
|
|
|
if (!this.level().isClientSide && i == 0 && this.canFallInLove()) {
|
2024-01-13 18:34:33 +01:00
|
|
|
+ final ItemStack breedCopy = itemstack.copy(); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
this.usePlayerItem(player, hand, itemstack);
|
|
|
|
- this.setInLove(player);
|
2024-01-13 18:34:33 +01:00
|
|
|
+ this.setInLove(player, breedCopy); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
return InteractionResult.SUCCESS;
|
|
|
|
}
|
|
|
|
|
2023-12-06 19:18:53 +01:00
|
|
|
@@ -182,10 +183,18 @@ public abstract class Animal extends AgeableMob {
|
2023-11-12 00:23:02 +01:00
|
|
|
return this.inLove <= 0;
|
|
|
|
}
|
|
|
|
|
2024-01-13 18:34:33 +01:00
|
|
|
+ @Deprecated @io.papermc.paper.annotation.DoNotUse // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
public void setInLove(@Nullable Player player) {
|
2024-01-13 18:34:33 +01:00
|
|
|
+ // Paper start - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
+ this.setInLove(player, null);
|
|
|
|
+ }
|
|
|
|
+ public void setInLove(@Nullable Player player, @Nullable ItemStack breedItemCopy) {
|
|
|
|
+ if (breedItemCopy != null) this.breedItem = breedItemCopy;
|
2024-01-13 18:34:33 +01:00
|
|
|
+ // Paper end - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
// CraftBukkit start
|
|
|
|
EntityEnterLoveModeEvent entityEnterLoveModeEvent = CraftEventFactory.callEntityEnterLoveModeEvent(player, this, 600);
|
|
|
|
if (entityEnterLoveModeEvent.isCancelled()) {
|
2024-01-13 18:34:33 +01:00
|
|
|
+ this.breedItem = null; // Paper - Fix EntityBreedEvent copying; clear if cancelled
|
2023-11-12 00:23:02 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
this.inLove = entityEnterLoveModeEvent.getTicksInLove();
|
2023-12-06 19:18:53 +01:00
|
|
|
@@ -193,7 +202,7 @@ public abstract class Animal extends AgeableMob {
|
2023-11-12 00:23:02 +01:00
|
|
|
if (player != null) {
|
|
|
|
this.loveCause = player.getUUID();
|
|
|
|
}
|
|
|
|
- this.breedItem = player.getInventory().getSelected(); // CraftBukkit
|
2024-01-13 18:34:33 +01:00
|
|
|
+ // Paper - Fix EntityBreedEvent copying; set breed item in better place
|
2023-11-12 00:23:02 +01:00
|
|
|
|
|
|
|
this.level().broadcastEntityEvent(this, (byte) 18);
|
|
|
|
}
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/Panda.java b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index 0297e234f17c6157cfff79420b9eeaf4e0e2c3ab..d683c49fdf2d1e5b0f2620641f9c241e82f96825 100644
|
2023-11-12 00:23:02 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/Panda.java
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
@@ -650,8 +650,9 @@ public class Panda extends Animal {
|
2023-11-12 00:23:02 +01:00
|
|
|
this.usePlayerItem(player, hand, itemstack);
|
|
|
|
this.ageUp((int) ((float) (-this.getAge() / 20) * 0.1F), true);
|
|
|
|
} else if (!this.level().isClientSide && this.getAge() == 0 && this.canFallInLove()) {
|
2024-01-13 18:34:33 +01:00
|
|
|
+ final ItemStack breedCopy = itemstack.copy(); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
this.usePlayerItem(player, hand, itemstack);
|
|
|
|
- this.setInLove(player);
|
2024-01-13 18:34:33 +01:00
|
|
|
+ this.setInLove(player, breedCopy); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
} else {
|
|
|
|
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
|
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 14:37:33 +01:00
|
|
|
index 5f879ec74cadc8b27f3c1648890978dbdc27f9f0..1f09d47b0ffb07b49b4d8bd79a371dd61f1c2a92 100644
|
2023-11-12 00:23:02 +01:00
|
|
|
--- 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
|
|
|
|
|
|
|
|
boolean bl2 = this.isTamed() && this.getAge() == 0 && this.canFallInLove();
|
|
|
|
if (bl2) {
|
|
|
|
- this.setInLove(player);
|
2024-01-13 18:34:33 +01:00
|
|
|
+ this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
boolean bl3 = 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
|
2024-01-21 19:37:09 +01:00
|
|
|
index 94dd97662ba07689fbfa16ef5c7d99fe12ce83de..815eb15086976b8f9e03bf8182d9ed50aec14720 100644
|
2023-11-12 00:23:02 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/AbstractHorse.java
|
|
|
|
@@ -513,7 +513,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
|
|
|
|
b0 = 5;
|
|
|
|
if (!this.level().isClientSide && this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
|
|
|
|
flag = true;
|
|
|
|
- this.setInLove(player);
|
2024-01-13 18:34:33 +01:00
|
|
|
+ this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
}
|
|
|
|
} else if (item.is(Items.GOLDEN_APPLE) || item.is(Items.ENCHANTED_GOLDEN_APPLE)) {
|
|
|
|
f = 10.0F;
|
|
|
|
@@ -521,7 +521,7 @@ public abstract class AbstractHorse extends Animal implements ContainerListener,
|
|
|
|
b0 = 10;
|
|
|
|
if (!this.level().isClientSide && this.isTamed() && this.getAge() == 0 && !this.isInLove()) {
|
|
|
|
flag = true;
|
|
|
|
- this.setInLove(player);
|
2024-01-13 18:34:33 +01:00
|
|
|
+ this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
2024-01-18 18:52:00 +01:00
|
|
|
index 9b5b894d43f25566ab9c3698705e978ab823a0d2..6623674136b0f865d5b3d7a10d3bf05793b82f87 100644
|
2023-11-12 00:23:02 +01:00
|
|
|
--- a/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
|
|
|
+++ b/src/main/java/net/minecraft/world/entity/animal/horse/Llama.java
|
|
|
|
@@ -191,7 +191,7 @@ public class Llama extends AbstractChestedHorse implements VariantHolder<Llama.V
|
|
|
|
f = 10.0F;
|
|
|
|
if (this.isTamed() && this.getAge() == 0 && this.canFallInLove()) {
|
|
|
|
flag = true;
|
|
|
|
- this.setInLove(player);
|
2024-01-13 18:34:33 +01:00
|
|
|
+ this.setInLove(player, item.copy()); // Paper - Fix EntityBreedEvent copying
|
2023-11-12 00:23:02 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|