[ci skip] Cleanup events (#10202)

patches/api/Add-ElderGuardianAppearanceEvent.patch

@@ -13,28 +13,26 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +package io.papermc.paper.event.entity;
 +
 +import org.bukkit.entity.ElderGuardian;
-+import org.bukkit.entity.Entity;
 +import org.bukkit.entity.Player;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
 +import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
-+import java.util.Collections;
-+import java.util.List;
-+
 +/**
-+ * Is called when an {@link org.bukkit.entity.ElderGuardian} appears in front of a {@link org.bukkit.entity.Player}.
++ * Is called when an {@link ElderGuardian} appears in front of a {@link Player}.
 + */
 +public class ElderGuardianAppearanceEvent extends EntityEvent implements Cancellable {
 +
-+    private static final HandlerList handlers = new HandlerList();
++    private static final HandlerList HANDLER_LIST = new HandlerList();
 +
-+    private boolean cancelled;
 +    private final Player affectedPlayer;
++    private boolean cancelled;
 +
-+    public ElderGuardianAppearanceEvent(@NotNull Entity what, @NotNull Player affectedPlayer) {
-+        super(what);
++    @ApiStatus.Internal
++    public ElderGuardianAppearanceEvent(@NotNull ElderGuardian guardian, @NotNull Player affectedPlayer) {
++        super(guardian);
 +        this.affectedPlayer = affectedPlayer;
 +    }
 +
@@ -45,7 +43,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    @NotNull
 +    public Player getAffectedPlayer() {
-+        return affectedPlayer;
++        return this.affectedPlayer;
 +    }
 +
 +    /**
@@ -55,12 +53,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    @NotNull
 +    public ElderGuardian getEntity() {
-+        return (ElderGuardian) entity;
++        return (ElderGuardian) super.getEntity();
 +    }
 +
 +    @Override
 +    public boolean isCancelled() {
-+        return cancelled;
++        return this.cancelled;
 +    }
 +
 +    @Override
@@ -71,11 +69,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    @NotNull
 +    @Override
 +    public HandlerList getHandlers() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +}