71c84c8132
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
152 Zeilen
4.8 KiB
Diff
152 Zeilen
4.8 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..35d54650c53bc64dd7c440240ad2f2b9b87d7ae8
|
|
--- /dev/null
|
|
+++ b/src/main/java/io/papermc/paper/event/entity/EntityFertilizeEggEvent.java
|
|
@@ -0,0 +1,139 @@
|
|
+package io.papermc.paper.event.entity;
|
|
+
|
|
+import org.bukkit.Material;
|
|
+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.EntityBreedEvent;
|
|
+import org.bukkit.event.entity.EntityEvent;
|
|
+import org.bukkit.inventory.ItemStack;
|
|
+import org.jetbrains.annotations.ApiStatus;
|
|
+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 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 Material#FROGSPAWN} later.</li>
|
|
+ * <li>Sniffers producing the {@link 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 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 cancelled;
|
|
+
|
|
+ @ApiStatus.Internal
|
|
+ public EntityFertilizeEggEvent(@NotNull LivingEntity mother, @NotNull LivingEntity father, @Nullable Player breeder, @Nullable ItemStack bredWith, int experience) {
|
|
+ super(mother);
|
|
+ this.mother = mother;
|
|
+ this.father = father;
|
|
+ this.breeder = breeder;
|
|
+ this.bredWith = bredWith;
|
|
+ this.experience = experience;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public LivingEntity getEntity() {
|
|
+ return (LivingEntity) super.getEntity();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * 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 this.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 this.father;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Gets the Entity responsible for fertilization. Breeder is {@code null} for spontaneous
|
|
+ * conception.
|
|
+ *
|
|
+ * @return The Entity who initiated fertilization.
|
|
+ */
|
|
+ @Nullable
|
|
+ public Player getBreeder() {
|
|
+ return this.breeder;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * The ItemStack that was used to initiate fertilization, if present.
|
|
+ *
|
|
+ * @return ItemStack used to initiate fertilization.
|
|
+ */
|
|
+ @Nullable
|
|
+ public ItemStack getBredWith() {
|
|
+ return this.bredWith;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Get the amount of experience granted by fertilization.
|
|
+ *
|
|
+ * @return experience amount
|
|
+ */
|
|
+ public int getExperience() {
|
|
+ return this.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 this.cancelled;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ public void setCancelled(boolean cancel) {
|
|
+ this.cancelled = cancel;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ @Override
|
|
+ public HandlerList getHandlers() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return HANDLER_LIST;
|
|
+ }
|
|
+}
|