ac554ad46d
Updated Upstream (Bukkit/CraftBukkit) 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: fa99e752 PR-1007: Add ItemMeta#getAsComponentString() 94a91782 Fix copy-pasted BlockType.Typed documentation 9b34ac8c Largely restore deprecated PotionData API 51a6449b PR-1008: Deprecate ITEMS_TOOLS, removed in 1.20.5 702d15fe Fix Javadoc reference 42f6cdf4 PR-919: Add internal ItemType and BlockType, delegate Material methods to them 237bb37b SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 035ea146 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 8c7880fb PR-1004: Improve field rename handling and centralize conversion between bukkit and string more 87c90e93 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent CraftBukkit Changes: 4af0f22e8 SPIGOT-7664: Item meta should prevail over block states c2ccc46ec SPIGOT-7666: Fix access to llama and horse special slot 124ac66d7 SPIGOT-7665: Fix ThrownPotion#getEffects() implementation only bringing custom effects 66f1f439a Restore null page behaviour of signed books even though not strictly allowed by API 6118e5398 Fix regression listening to minecraft:brand custom payloads c1a26b366 Fix unnecessary and potential not thread-safe chat visibility check 12360a7ec Remove unused imports 147b098b4 PR-1397: Add ItemMeta#getAsComponentString() 428aefe0e Largely restore deprecated PotionData API afe5b5ee9 PR-1275: Add internal ItemType and BlockType, delegate Material methods to them 8afeafa7d SPIGOT-1166, SPIGOT-7647: Expose Damager BlockState in EntityDamageByBlockEvent 4e7d749d4 SPIGOT-6993: Allow #setVelocity to change the speed of a fireball and add a note to #setDirection about it 441880757 Support both entity_data and bucket_entity_data on axolotl/fish buckets 0e22fdd1e Fix custom direct BlockState being not correctly set in DamageSource f2182ed47 SPIGOT-7659: TropicalFishBucketMeta should use BUCKET_ENTITY_DATA 2a6207fe1 PR-1393: Improve field rename handling and centralize conversion between bukkit and string more c024a5039 SPIGOT-7650: Add DamageSource for EntityDeathEvent and PlayerDeathEvent 741b84480 PR-1390: Improve internal handling of damage sources 0364df4e1 SPIGOT-7657: Error when loading angry entities
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;
|
|
+ }
|
|
+}
|