From 1bb3677651770f274404b2a245c9b51cb82b776a Mon Sep 17 00:00:00 2001 From: Bjarne Koll Date: Mon, 13 Jan 2025 17:51:58 +0100 Subject: [PATCH] Remove deprecation from EntityRemoveEvent (#11961) Bukkits entity remove event is called at a different time than the existing paper event, specifically it is called after an entity has been stored during chunk unloads. This means that, while the bukkit event can have a defined reason, it does not allow modification to the entity data. In this regard it differs from the paper implementation and prevents developers from using the paper event as an alternative. Co-authored-by: TonytheMacaroni --- .../java/org/bukkit/event/entity/EntityRemoveEvent.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/paper-api/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java b/paper-api/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java index 8ed5d1ccc4..2a826175fe 100644 --- a/paper-api/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java +++ b/paper-api/src/main/java/org/bukkit/event/entity/EntityRemoveEvent.java @@ -1,9 +1,7 @@ package org.bukkit.event.entity; -import com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent; import org.bukkit.entity.Entity; import org.bukkit.event.HandlerList; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; /** @@ -12,9 +10,11 @@ import org.jetbrains.annotations.NotNull; * This event should only be used for monitoring. The result * of modifying the entity during or after this event is unspecified. * This event is not called for a {@link org.bukkit.entity.Player}. - * @deprecated use {@link EntityRemoveFromWorldEvent} instead + *

+ * It differs from {@link com.destroystokyo.paper.event.entity.EntityRemoveFromWorldEvent} as to when it is called. + * Modifications to the entity, as noted above, are not defined and are expected to not be persisted in e.g., chunk + * unloads. */ -@Deprecated(forRemoval = true) public class EntityRemoveEvent extends EntityEvent { private static final HandlerList handlers = new HandlerList();