c0936a71bd
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: 01aa02eb PR-858: Add LivingEntity#playHurtAnimation() 9421320f PR-884: Refinements to new ban API for improved compatibility and correctness 37a60b45 SPIGOT-6455, SPIGOT-7030, PR-750: Improve ban API 4eeb174b All smithing inventories are now the new smithing inventory f2bb168e PR-880: Add methods to get/set FallingBlock CancelDrop e7a807fa PR-879: Add Player#sendHealthUpdate() 692b8e96 SPIGOT-7370: Remove float value conversion in plugin.yml 2d033390 SPIGOT-7403: Add direct API for waxed signs 16a08373 PR-876: Add missing Raider API and 'no action ticks' CraftBukkit Changes: b60a95c8c PR-1189: Add LivingEntity#playHurtAnimation() 95c335c63 PR-1226: Fix VehicleEnterEvent not being called for certain entities 0a0fc3bee PR-1227: Refinements to new ban API for improved compatibility and correctness 0d0b1e5dc Revert bad change to PathfinderGoalSit causing all cats to sit 648196070 SPIGOT-6455, SPIGOT-7030, PR-1054: Improve ban API 31fe848d6 All smithing inventories are now the new smithing inventory 9a919a143 SPIGOT-7416: SmithItemEvent not firing in Smithing Table 9f64f0d22 PR-1221: Add methods to get/set FallingBlock CancelDrop 3be9ac171 PR-1220: Add Player#sendHealthUpdate() c1279f775 PR-1209: Clean up various patches c432e4397 Fix Raider#setCelebrating() implementation 504d96665 SPIGOT-7403: Add direct API for waxed signs c68c1f1b3 PR-1216: Add missing Raider API and 'no action ticks' 85b89c3dd Increase outdated build delay Spigot Changes: 9ebce8af Rebuild patches 64b565e6 Rebuild patches
153 Zeilen
4.9 KiB
Diff
153 Zeilen
4.9 KiB
Diff
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..adc596cae5e4a6e52c51eba16b5aa37410d30e5c
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java
|
|
@@ -0,0 +1,140 @@
|
|
+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 two entities mate and the mating process results in a fertilization.
|
|
+ * Fertilization differs from normal breeding, as represented by the {@link org.bukkit.event.entity.EntityBreedEvent}, as
|
|
+ * it does not result in the immediate creation of the child entity in the world.
|
|
+ * <p>
|
|
+ * An example of this would be:
|
|
+ * <ul>
|
|
+ * <li>A frog being marked as "is_pregnant" and laying {@link org.bukkit.Material#FROGSPAWN} later.</li>
|
|
+ * <li>Sniffers producing the {@link org.bukkit.Material#SNIFFER_EGG} item, which needs to be placed before it can begin to hatch.</li>
|
|
+ * <li>A turtle being marked with "HasEgg" and laying a {@link org.bukkit.Material#TURTLE_EGG} later.</li>
|
|
+ * </ul>
|
|
+ *
|
|
+ * The event hence only exposes the two parent entities in the fertilization process and cannot provide the child entity, as it will only exist at a later point in time.
|
|
+ */
|
|
+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;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Provides the entity in the fertilization process that will eventually be responsible for "creating" offspring,
|
|
+ * may that be by setting a block that later hatches or dropping an egg that has to be placed.
|
|
+ *
|
|
+ * @return The "mother" entity.
|
|
+ */
|
|
+ @NotNull
|
|
+ public LivingEntity getMother() {
|
|
+ return mother;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Provides the "father" entity in the fertilization process that is not responsible for initiating the offspring
|
|
+ * creation.
|
|
+ *
|
|
+ * @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;
|
|
+ }
|
|
+}
|