[ci skip] Cleanup events (#10202)

patches/api/Add-TameableDeathMessageEvent.patch

@@ -17,6 +17,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +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;
 +
 +/**
@@ -24,12 +25,14 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 + */
 +public class TameableDeathMessageEvent extends EntityEvent implements Cancellable {
 +
-+    private static final HandlerList handlers = new HandlerList();
-+    private boolean cancelled;
-+    private Component deathMessage;
++    private static final HandlerList HANDLER_LIST = new HandlerList();
 +
-+    public TameableDeathMessageEvent(@NotNull Tameable what, @NotNull Component deathMessage) {
-+        super(what);
++    private Component deathMessage;
++    private boolean cancelled;
++
++    @ApiStatus.Internal
++    public TameableDeathMessageEvent(@NotNull Tameable tameable, @NotNull Component deathMessage) {
++        super(tameable);
 +        this.deathMessage = deathMessage;
 +    }
 +
@@ -49,12 +52,18 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +     */
 +    @NotNull
 +    public Component deathMessage() {
-+        return deathMessage;
++        return this.deathMessage;
++    }
++
++    @NotNull
++    @Override
++    public Tameable getEntity() {
++        return (Tameable) super.getEntity();
 +    }
 +
 +    @Override
 +    public boolean isCancelled() {
-+        return cancelled;
++        return this.cancelled;
 +    }
 +
 +    @Override
@@ -64,18 +73,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +
 +    @NotNull
 +    @Override
-+    public Tameable getEntity() {
-+        return (Tameable) super.getEntity();
-+    }
-+
-+    @NotNull
-+    @Override
 +    public HandlerList getHandlers() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +
 +    @NotNull
 +    public static HandlerList getHandlerList() {
-+        return handlers;
++        return HANDLER_LIST;
 +    }
 +}