[ci skip] Minor cleanup and patch merges

patches/api/0009-Paper-Plugins.patch

@@ -2097,7 +2097,7 @@ index 6d634b0ea813ccb19f1562a7d0e5a59cea4eab21..653135352c104a6ddeb74a1b6d4916c6
          }
  
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 64a294aeb6fb548794708b38c3707f9dd882b2ff..74b6581a97a092c44a0876e7981ff8a8e6153100 100644
+index 64a294aeb6fb548794708b38c3707f9dd882b2ff..58d20eff7e0da2d7fcb1609d55e4284715355634 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -31,7 +31,8 @@ import org.jetbrains.annotations.Nullable;
@@ -2124,7 +2124,7 @@ index 64a294aeb6fb548794708b38c3707f9dd882b2ff..74b6581a97a092c44a0876e7981ff8a8
  
 -    PluginClassLoader(@NotNull final JavaPluginLoader loader, @Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader) throws IOException, InvalidPluginException, MalformedURLException {
 +    @org.jetbrains.annotations.ApiStatus.Internal // Paper
-+    public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider
++    public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper - use JarFile provided by SpigotPluginProvider
          super(new URL[] {file.toURI().toURL()}, parent);
 -        Preconditions.checkArgument(loader != null, "Loader cannot be null");
 +        this.loader = null; // Paper - pass null into loader field

patches/api/0304-Rewrite-LogEvents-to-contain-the-source-jars-in-stac.patch

@@ -5,13 +5,13 @@ Subject: [PATCH] Rewrite LogEvents to contain the source jars in stack traces
 
 
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index d6d3e1332e51adc5611543b2a6689efa5921a9f2..877bfe10b858145278133acbc7049f700d2b4f8a 100644
+index 8c5597e02d71c8db66e9cd11f0a41776eb471c46..de017d10db19ca7ca7f73ff0ac08fe6e1773d7dc 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -56,7 +56,7 @@ public final class PluginClassLoader extends URLClassLoader implements io.paperm
  
      @org.jetbrains.annotations.ApiStatus.Internal // Paper
-     public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper // Paper - use JarFile provided by SpigotPluginProvider
+     public PluginClassLoader(@Nullable final ClassLoader parent, @NotNull final PluginDescriptionFile description, @NotNull final File dataFolder, @NotNull final File file, @Nullable ClassLoader libraryLoader, JarFile jarFile, io.papermc.paper.plugin.provider.entrypoint.DependencyContext dependencyContext) throws IOException, InvalidPluginException, MalformedURLException { // Paper - use JarFile provided by SpigotPluginProvider
 -        super(new URL[] {file.toURI().toURL()}, parent);
 +        super(file.getName(), new URL[] {file.toURI().toURL()}, parent);
          this.loader = null; // Paper - pass null into loader field

patches/api/0328-Extend-VehicleCollisionEvent-move-HandlerList-up.patch

@@ -1,23 +1,48 @@
 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
+Subject: [PATCH] Extend VehicleCollisionEvent, move HandlerList up
 
+Co-authored-by: SoSeDiK <mrsosedik@gmail.com>
 
 diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-index 316f625aa595d2ada16529b16d09f013fc4daeac..7ff9aec7ed341c01feddb8d71170b177e1fde47b 100644
+index 316f625aa595d2ada16529b16d09f013fc4daeac..d0a437bd8aeec18f800893f51ece06deb0c8972c 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-@@ -9,7 +9,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -9,13 +9,31 @@ 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;
++    private final org.bukkit.util.Vector velocity; // Paper
  
++    // Paper start - Add pre-collision velocity
++    @Deprecated
      public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block) {
-@@ -26,15 +26,4 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
++        this(vehicle, block, vehicle.getVelocity());
++    }
++
++    public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block, @NotNull final org.bukkit.util.Vector velocity) { // Paper - Added velocity
+         super(vehicle);
+         this.block = block;
++        this.velocity = velocity;
++    }
++
++    /**
++     * Gets velocity at which the vehicle collided with the block
++     *
++     * @return pre-collision moving velocity
++     */
++    @NotNull
++    public org.bukkit.util.Vector getVelocity() {
++        return velocity;
+     }
++    // Paper end
+ 
+     /**
+      * Gets the block the vehicle collided with
+@@ -26,15 +44,4 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
      public Block getBlock() {
          return block;
      }
@@ -57,19 +82,18 @@ index 9d493c155ad5c26430c1e404fcf0db5f734679e4..aa1d74eade479195bde8095aafcc91a8
 +    // 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 50c762d777ac90a05772501a28cacff8fd3f5126..f7f8d6274d49895f0b7db92a84bc224d936022ba 100644
+index 50c762d777ac90a05772501a28cacff8fd3f5126..77fb04bdf5b1a6d94693a7374a750e020131dc3d 100644
 --- a/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
 +++ b/src/main/java/org/bukkit/event/vehicle/VehicleEntityCollisionEvent.java
-@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
+@@ -10,7 +10,6 @@ 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;
-@@ -55,15 +55,4 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
+@@ -55,15 +54,4 @@ public class VehicleEntityCollisionEvent extends VehicleCollisionEvent implement
      public void setCollisionCancelled(boolean cancel) {
          cancelledCollision = cancel;
      }

patches/api/0400-Expose-pre-collision-moving-velocity-to-VehicleBlock.patch

@@ -1,49 +0,0 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: SoSeDiK <mrsosedik@gmail.com>
-Date: Tue, 11 Oct 2022 23:30:32 +0300
-Subject: [PATCH] Expose pre-collision moving velocity to
- VehicleBlockCollisionEvent
-
-
-diff --git a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-index 7ff9aec7ed341c01feddb8d71170b177e1fde47b..d2b33f4105ae32a884e714a8936e3d91e23a00a0 100644
---- a/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-+++ b/src/main/java/org/bukkit/event/vehicle/VehicleBlockCollisionEvent.java
-@@ -11,11 +11,20 @@ import org.jetbrains.annotations.NotNull;
- public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
-     // private static final HandlerList handlers = new HandlerList(); // Paper - move HandlerList to VehicleCollisionEvent
-     private final Block block;
-+    private final org.bukkit.util.Vector velocity; // Paper
- 
-+    // Paper start - Add pre-collision velocity
-+    @Deprecated
-     public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block) {
-+        this(vehicle, block, vehicle.getVelocity());
-+    }
-+
-+    public VehicleBlockCollisionEvent(@NotNull final Vehicle vehicle, @NotNull final Block block, @NotNull final org.bukkit.util.Vector velocity) { // Paper - Added velocity
-         super(vehicle);
-         this.block = block;
-+        this.velocity = velocity;
-     }
-+    // Paper end
- 
-     /**
-      * Gets the block the vehicle collided with
-@@ -26,4 +35,16 @@ public class VehicleBlockCollisionEvent extends VehicleCollisionEvent {
-     public Block getBlock() {
-         return block;
-     }
-+
-+    // Paper start
-+    /**
-+     * Gets velocity at which the vehicle collided with the block
-+     *
-+     * @return pre-collision moving velocity
-+     */
-+    @NotNull
-+    public org.bukkit.util.Vector getVelocity() {
-+        return velocity;
-+    }
-+    // Paper end
- }