From 3dcf4e41981b2f60dfda31d9477c1ccc819bcb3c Mon Sep 17 00:00:00 2001 From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> Date: Sat, 4 Mar 2023 23:23:32 +0100 Subject: [PATCH] Add EntityFertilizeEggEvent (#8041) --- .../0418-Add-EntityFertilizeEggEvent.patch | 140 ++++++++++++++++++ .../0964-Add-EntityFertilizeEggEvent.patch | 74 +++++++++ 2 files changed, 214 insertions(+) create mode 100644 patches/api/0418-Add-EntityFertilizeEggEvent.patch create mode 100644 patches/server/0964-Add-EntityFertilizeEggEvent.patch diff --git a/patches/api/0418-Add-EntityFertilizeEggEvent.patch b/patches/api/0418-Add-EntityFertilizeEggEvent.patch new file mode 100644 index 0000000000..f9604adba0 --- /dev/null +++ b/patches/api/0418-Add-EntityFertilizeEggEvent.patch @@ -0,0 +1,140 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> +Date: Fri, 24 Jun 2022 11:56:32 +0200 +Subject: [PATCH] Add EntityFertilizeEggEvent + + +diff --git a/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java b/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java +new file mode 100644 +index 0000000000000000000000000000000000000000..159b3b541991be34a5db856e3706a97afc8afb3d +--- /dev/null ++++ b/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java +@@ -0,0 +1,128 @@ ++package io.papermc.paper.event.entity; ++ ++import com.google.common.base.Preconditions; ++import org.bukkit.entity.LivingEntity; ++import org.bukkit.entity.Player; ++import org.bukkit.event.Cancellable; ++import org.bukkit.event.HandlerList; ++import org.bukkit.event.entity.EntityEvent; ++import org.bukkit.inventory.ItemStack; ++import org.jetbrains.annotations.NotNull; ++import org.jetbrains.annotations.Nullable; ++ ++/** ++ * Called when a mating occurs that results in a pregnancy. ++ * After a bit of time, the mother will lay an egg. ++ */ ++public class EntityFertilizeEggEvent extends EntityEvent implements Cancellable { ++ ++ private static final HandlerList HANDLER_LIST = new HandlerList(); ++ ++ private final LivingEntity mother; ++ private final LivingEntity father; ++ private final Player breeder; ++ private final ItemStack bredWith; ++ private int experience; ++ ++ private boolean cancel; ++ ++ public EntityFertilizeEggEvent(@NotNull LivingEntity mother, @NotNull LivingEntity father, @Nullable Player breeder, @Nullable ItemStack bredWith, int experience) { ++ super(mother); ++ Preconditions.checkArgument(mother != null, "Cannot have null mother"); ++ Preconditions.checkArgument(father != null, "Cannot have null father"); ++ ++ // Breeder can be null in the case of spontaneous conception ++ this.mother = mother; ++ this.father = father; ++ this.breeder = breeder; ++ this.bredWith = bredWith; ++ this.experience = experience; ++ } ++ ++ @NotNull ++ @Override ++ public LivingEntity getEntity() { ++ return (LivingEntity) entity; ++ } ++ ++ /** ++ * Gets the parent creating this entity. ++ * ++ * @return The "birth" parent ++ */ ++ @NotNull ++ public LivingEntity getMother() { ++ return mother; ++ } ++ ++ /** ++ * Gets the other parent of the newly born entity. ++ * ++ * @return the other parent ++ */ ++ @NotNull ++ public LivingEntity getFather() { ++ return father; ++ } ++ ++ /** ++ * Gets the Entity responsible for fertilization. Breeder is null for spontaneous ++ * conception. ++ * ++ * @return The Entity who initiated breeding. ++ */ ++ @Nullable ++ public Player getBreeder() { ++ return breeder; ++ } ++ ++ /** ++ * The ItemStack that was used to initiate fertilization, if present. ++ * ++ * @return ItemStack used to initiate breeding. ++ */ ++ @Nullable ++ public ItemStack getBredWith() { ++ return bredWith; ++ } ++ ++ /** ++ * Get the amount of experience granted by fertilization. ++ * ++ * @return experience amount ++ */ ++ public int getExperience() { ++ return experience; ++ } ++ ++ /** ++ * Set the amount of experience granted by fertilization. ++ * If the amount is negative or zero, no experience will be dropped. ++ * ++ * @param experience experience amount ++ */ ++ public void setExperience(int experience) { ++ this.experience = experience; ++ } ++ ++ @Override ++ public boolean isCancelled() { ++ return cancel; ++ } ++ ++ @Override ++ public void setCancelled(boolean cancel) { ++ this.cancel = cancel; ++ } ++ ++ @NotNull ++ @Override ++ public HandlerList getHandlers() { ++ return HANDLER_LIST; ++ } ++ ++ @NotNull ++ public static HandlerList getHandlerList() { ++ return HANDLER_LIST; ++ } ++} diff --git a/patches/server/0964-Add-EntityFertilizeEggEvent.patch b/patches/server/0964-Add-EntityFertilizeEggEvent.patch new file mode 100644 index 0000000000..4b05bb180b --- /dev/null +++ b/patches/server/0964-Add-EntityFertilizeEggEvent.patch @@ -0,0 +1,74 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Lulu13022002 <41980282+Lulu13022002@users.noreply.github.com> +Date: Fri, 24 Jun 2022 12:39:34 +0200 +Subject: [PATCH] Add EntityFertilizeEggEvent + + +diff --git a/src/main/java/net/minecraft/world/entity/animal/Turtle.java b/src/main/java/net/minecraft/world/entity/animal/Turtle.java +index 25503678e7d049a8b3172cfad8a5606958c32302..7f9ec1888eb9c02705426d60cf4e3aa7c6d43115 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/Turtle.java ++++ b/src/main/java/net/minecraft/world/entity/animal/Turtle.java +@@ -436,6 +436,17 @@ public class Turtle extends Animal { + if (entityplayer == null && this.partner.getLoveCause() != null) { + entityplayer = this.partner.getLoveCause(); + } ++ // Paper start ++ RandomSource randomsource = this.animal.getRandom(); ++ int experience = randomsource.nextInt(7) + 1; ++ io.papermc.paper.event.entity.EntityFertilizeEggEvent event = new io.papermc.paper.event.entity.EntityFertilizeEggEvent((org.bukkit.entity.LivingEntity) turtle.getBukkitEntity(), (org.bukkit.entity.LivingEntity) partner.getBukkitEntity(), entityplayer == null ? null : entityplayer.getBukkitEntity(), turtle.breedItem == null ? null : org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(turtle.breedItem).clone(), experience); ++ if (!event.callEvent()) { ++ animal.resetLove(); ++ partner.resetLove(); // stop the pathfinding to avoid infinite loop ++ return; ++ } ++ experience = event.getExperience(); ++ // Paper end + + if (entityplayer != null) { + entityplayer.awardStat(Stats.ANIMALS_BRED); +@@ -447,10 +458,9 @@ public class Turtle extends Animal { + this.partner.setAge(6000); + this.animal.resetLove(); + this.partner.resetLove(); +- RandomSource randomsource = this.animal.getRandom(); + +- if (this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { +- this.level.addFreshEntity(new ExperienceOrb(this.level, this.animal.getX(), this.animal.getY(), this.animal.getZ(), randomsource.nextInt(7) + 1, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, entityplayer)); // Paper; ++ if (experience > 0 && this.level.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper ++ this.level.addFreshEntity(new ExperienceOrb(this.level, this.animal.getX(), this.animal.getY(), this.animal.getZ(), experience, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, entityplayer)); // Paper + } + + } +diff --git a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +index f2e84e832ad95df26fe3b9ba439ce38fc59b3585..63cb093e41ef9eed43c8bbb758596f8df324f47f 100644 +--- a/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java ++++ b/src/main/java/net/minecraft/world/entity/animal/frog/Frog.java +@@ -265,6 +265,17 @@ public class Frog extends Animal implements VariantHolder { + serverPlayer = other.getLoveCause(); + } + ++ // Paper start ++ int experience = this.getRandom().nextInt(7) + 1; ++ io.papermc.paper.event.entity.EntityFertilizeEggEvent event = new io.papermc.paper.event.entity.EntityFertilizeEggEvent((org.bukkit.entity.LivingEntity) this.getBukkitEntity(), (org.bukkit.entity.LivingEntity) other.getBukkitEntity(), serverPlayer == null ? null : serverPlayer.getBukkitEntity(), this.breedItem == null ? null : org.bukkit.craftbukkit.inventory.CraftItemStack.asCraftMirror(this.breedItem).clone(), experience); ++ if (!event.callEvent()) { ++ resetLove(); ++ other.resetLove(); // stop the pathfinding to avoid infinite loop ++ return; ++ } ++ experience = event.getExperience(); ++ // Paper end ++ + if (serverPlayer != null) { + serverPlayer.awardStat(Stats.ANIMALS_BRED); + CriteriaTriggers.BRED_ANIMALS.trigger(serverPlayer, this, other, (AgeableMob)null); +@@ -276,8 +287,8 @@ public class Frog extends Animal implements VariantHolder { + other.resetLove(); + this.getBrain().setMemory(MemoryModuleType.IS_PREGNANT, Unit.INSTANCE); + world.broadcastEntityEvent(this, (byte)18); +- if (world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { +- world.addFreshEntity(new ExperienceOrb(world, this.getX(), this.getY(), this.getZ(), this.getRandom().nextInt(7) + 1, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, serverPlayer)); // Paper ++ if (experience > 0 && world.getGameRules().getBoolean(GameRules.RULE_DOMOBLOOT)) { // Paper ++ world.addFreshEntity(new ExperienceOrb(world, this.getX(), this.getY(), this.getZ(), experience, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, serverPlayer)); // Paper + } + + }