1 files changed, 32 insertions, 27 deletions
diff --git a/patches/api/0046-Add-ProjectileCollideEvent.patch b/patches/api/0046-Add-ProjectileCollideEvent.patch
index 24d739cb59..81ae892c59 100644
--- a/patches/api/0046-Add-ProjectileCollideEvent.patch
+++ b/patches/api/0046-Add-ProjectileCollideEvent.patch
@@ -7,41 +7,40 @@ Now deprecated and replaced with ProjectileHitEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..6ae2bc3d952d34f298220738856024e0b6594199
+index 0000000000000000000000000000000000000000..3caff9cbb990e03d4331bd601272aec5090affcf
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/entity/ProjectileCollideEvent.java
-@@ -0,0 +1,69 @@
+@@ -0,0 +1,74 @@
 +package com.destroystokyo.paper.event.entity;
 +
 +import org.bukkit.entity.Entity;
 +import org.bukkit.entity.Projectile;
 +import org.bukkit.event.Cancellable;
 +import org.bukkit.event.HandlerList;
++import org.bukkit.event.entity.EntityDamageByEntityEvent;
 +import org.bukkit.event.entity.EntityEvent;
++import org.jetbrains.annotations.ApiStatus;
 +import org.jetbrains.annotations.NotNull;
 +
 +/**
 + * Called when a projectile collides with an entity
 + * <p>
-+ * This event is called <b>before</b> {@link org.bukkit.event.entity.EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
++ * This event is called <b>before</b> {@link EntityDamageByEntityEvent}, and cancelling it will allow the projectile to continue flying
++ *
 + * @deprecated Deprecated, use {@link org.bukkit.event.entity.ProjectileHitEvent} and check if there is a hit entity
 + */
 +@Deprecated
 +public class ProjectileCollideEvent extends EntityEvent implements Cancellable {
++
++    private static final HandlerList HANDLER_LIST = new HandlerList();
++
 +    @NotNull private final Entity collidedWith;
 +
-+    /**
-+     * Get the entity the projectile collided with
-+     *
-+     * @return the entity collided with
-+     */
-+    @NotNull
-+    public Entity getCollidedWith() {
-+        return collidedWith;
-+    }
++    private boolean cancelled;
 +
-+    public ProjectileCollideEvent(@NotNull Projectile what, @NotNull Entity collidedWith) {
-+        super(what);
++    @ApiStatus.Internal
++    public ProjectileCollideEvent(@NotNull Projectile projectile, @NotNull Entity collidedWith) {
++        super(projectile);
 +        this.collidedWith = collidedWith;
 +    }
 +
@@ -55,28 +54,34 @@ index 0000000000000000000000000000000000000000..6ae2bc3d952d34f298220738856024e0
 +        return (Projectile) super.getEntity();
 +    }
 +
-+    private static final HandlerList handlerList = new HandlerList();
-+
-+    @NotNull
-+    public static HandlerList getHandlerList() {
-+        return handlerList;
-+    }
-+
++    /**
++     * Get the entity the projectile collided with
++     *
++     * @return the entity collided with
++     */
 +    @NotNull
-+    @Override
-+    public HandlerList getHandlers() {
-+        return handlerList;
++    public Entity getCollidedWith() {
++        return this.collidedWith;
 +    }
 +
-+    private boolean cancelled = false;
-+
 +    @Override
 +    public boolean isCancelled() {
-+        return cancelled;
++        return this.cancelled;
 +    }
 +
 +    @Override
 +    public void setCancelled(boolean cancel) {
 +        this.cancelled = cancel;
 +    }
++
++    @NotNull
++    public static HandlerList getHandlerList() {
++        return HANDLER_LIST;
++    }
++
++    @NotNull
++    @Override
++    public HandlerList getHandlers() {
++        return HANDLER_LIST;
++    }
 +}