[ci skip] Cleanup events (#10202)

patches/api/Add-PhantomPreSpawnEvent.patch

@@ -18,13 +18,12 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +import org.bukkit.event.entity.CreatureSpawnEvent;
 +import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
-+import org.jetbrains.annotations.Nullable;
-+
 +
 +/**
 + * Called when a phantom is spawned for an exhausted player
 + */
 +public class PhantomPreSpawnEvent extends PreCreatureSpawnEvent {
++
 +    @NotNull private final Entity entity;
 +
 +    @ApiStatus.Internal
@@ -36,11 +35,11 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
 +    /**
 +     * Get the entity this phantom is spawning for
 +     *
-+     * @return Entity
++     * @return the Entity
 +     */
 +    @NotNull
 +    public Entity getSpawningEntity() {
-+        return entity;
++        return this.entity;
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Phantom.java b/src/main/java/org/bukkit/entity/Phantom.java