From dc7b80c2134465df4904cdbc19730e1b43192abb Mon Sep 17 00:00:00 2001
From: Jake Potrebic <jake.m.potrebic@gmail.com>
Date: Tue, 21 Dec 2021 16:34:44 -0800
Subject: [PATCH] Move VehicleCollisionEvent HandlerList up (#7112)

---
 ...VehicleCollisionEvent-HandlerList-up.patch | 87 +++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 patches/api/Move-VehicleCollisionEvent-HandlerList-up.patch

diff --git a/patches/api/Move-VehicleCollisionEvent-HandlerList-up.patch b/patches/api/Move-VehicleCollisionEvent-HandlerList-up.patch
new file mode 100644
index 0000000000..af1b30cdd3
--- /dev/null
+++ b/patches/api/Move-VehicleCollisionEvent-HandlerList-up.patch
@@ -0,0 +1,87 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Jake Potrebic <jake.m.potrebic@gmail.com>
+Date: Mon, 13 Dec 2021 14:35:27 -0800
+Subject: [PATCH] Move VehicleCollisionEvent HandlerList up
+
+
+diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
++++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
+  * Raised when a vehicle collides with a block.
+  */
+ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
+-    private static final HandlerList handlers = new HandlerList();
++    // private static final HandlerList handlers = new HandlerList(); // Paper - move HandlerList to VehicleCollisionEvent
+     private final Block block;
+ 
+     public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block) {
+@@ -0,0 +0,0 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
+     public Block getBlock() {
+         return block;
+     }
+-
+-    @NotNull
+-    @Override
+-    public HandlerList getHandlers() {
+-        return handlers;
+-    }
+-
+-    @NotNull
+-    public static HandlerList getHandlerList() {
+-        return handlers;
+-    }
+ }
+diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
++++ b/src/main/java/org/bukkit/event/vehicle/VehicleCollisionEvent.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
+  * Raised when a vehicle collides.
+  */
+ public abstract class VehicleCollisionEvent extends VehicleEvent {
++    private static final org.bukkit.event.HandlerList HANDLER_LIST = new org.bukkit.event.HandlerList(); // Paper
+     public VehicleCollisionEvent(@NotNull final Vehicle vehicle) {
+         super(vehicle);
+     }
++    // Paper start
++    @Override
++    public org.bukkit.event.@org.jetbrains.annotations.NotNull HandlerList getHandlers() {
++        return HANDLER_LIST;
++    }
++
++    public static org.bukkit.event.@NotNull HandlerList getHandlerList() {
++        return HANDLER_LIST;
++    }
++    // Paper end
+ }
+diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
++++ b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
+  * Raised when a vehicle collides with an entity.
+  */
+ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implements Cancellable {
+-    private static final HandlerList handlers = new HandlerList();
++    // private static final HandlerList handlers = new HandlerList(); // Paper - move HandlerList to VehicleCollisionEvent
+     private final Entity entity;
+     private boolean cancelled = false;
+     private boolean cancelledPickup = false;
+@@ -0,0 +0,0 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
+     public void setCollisionCancelled(boolean cancel) {
+         cancelledCollision = cancel;
+     }
+-
+-    @NotNull
+-    @Override
+-    public HandlerList getHandlers() {
+-        return handlers;
+-    }
+-
+-    @NotNull
+-    public static HandlerList getHandlerList() {
+-        return handlers;
+-    }
+ }