2fa8efce9b
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: 82af5dc6 SPIGOT-7396: Add PlayerSignOpenEvent 3f0281ca SPIGOT-7063, PR-763: Add DragonBattle#initiateRespawn with custom EnderCrystals f83c8df4 PR-873: Add PlayerRecipeBookClickEvent 14560d39 SPIGOT-7435: Add TeleportCause#EXIT_BED 2cc6db92 SPIGOT-7422, PR-887: Add API to set sherds on decorated pots 36022f02 PR-883: Add ItemFactory#getSpawnEgg 12eb5c46 PR-881: Update Scoreboard Javadocs, remove explicit exception throwing f6d8d44a PR-882: Add modern time API methods to ban API 21a7b710 Upgrade some Maven plugins to reduce warnings 11fd1225 PR-886: Deprecate the SmithingRecipe constructor as it now does nothing dbd1761d SPIGOT-7406: Improve documentation for getDragonBattle CraftBukkit Changes: d548daac2 SPIGOT-7446: BlockState#update not updating a spawner's type to null 70e0bc050 SPIGOT-7447: Fix --forceUpgrade 6752f1d63 SPIGOT-7396: Add PlayerSignOpenEvent 847b4cad5 SPIGOT-7063, PR-1071: Add DragonBattle#initiateRespawn with custom EnderCrystals c335a555f PR-1212: Add PlayerRecipeBookClickEvent 4be756ecb SPIGOT-7445: Fix opening smithing inventory db70bd6ed SPIGOT-7441: Fix issue placing certain items in creative/op f7fa6d993 SPIGOT-7435: Add TeleportCause#EXIT_BED b435e8e8d SPIGOT-7349: Player#setDisplayName not working when message/format unmodified a2fafdd1d PR-1232: Re-add fix for player rotation 7cf863de1 PR-1233: Remove some old MC bug fixes now fixed in vanilla 08ec344ad Fix ChunkGenerator#generateCaves never being called 5daeb502a SPIGOT-7422, PR-1228: Add API to set sherds on decorated pots 52faa6b32 PR-1224: Add ItemFactory#getSpawnEgg 01cae71b7 SPIGOT-7429: Fix LEFT_CLICK_AIR not working for passable entities and spectators a94277a18 PR-1223: Remove non-existent scoreboard display name/prefix/suffix limits 36b107660 PR-1225: Add modern time API methods to ban API 59ead25bc Upgrade some Maven plugins to reduce warnings 202fc5c4e Increase outdated build delay ce545de57 SPIGOT-7398: TextDisplay#setInterpolationDuration incorrectly updates the line width Spigot Changes: b41c46db Rebuild patches 3374045a SPIGOT-7431: Fix EntityMountEvent returning opposite entities 0ca4eb66 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;
|
|
+ }
|
|
+}
|