Swap some nullable annotations (#9696)

patches/api/Fix-Spigot-annotation-mistakes.patch

@@ -491,6 +491,19 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
          return offers;
      }
  
+diff --git a/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java b/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
++++ b/src/main/java/org/bukkit/event/entity/EntityTargetLivingEntityEvent.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
+  * LivingEntity's.
+  */
+ public class EntityTargetLivingEntityEvent extends EntityTargetEvent {
+-    public EntityTargetLivingEntityEvent(@NotNull final Entity entity, @Nullable final LivingEntity target, @Nullable final TargetReason reason) {
++    public EntityTargetLivingEntityEvent(@NotNull final Entity entity, @Nullable final LivingEntity target, @NotNull final TargetReason reason) { // Paper
+         super(entity, target, reason);
+     }
+ 
 diff --git a/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java b/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/entity/EntityToggleSwimEvent.java
@@ -510,6 +523,75 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      @Override
      public void setCancelled(boolean cancel) {
          this.cancel = cancel;
+diff --git a/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java b/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
++++ b/src/main/java/org/bukkit/event/entity/SpawnerSpawnEvent.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.NotNull;
+ public class SpawnerSpawnEvent extends EntitySpawnEvent {
+     private final CreatureSpawner spawner;
+ 
+-    public SpawnerSpawnEvent(@NotNull final Entity spawnee, @NotNull final CreatureSpawner spawner) {
++    public SpawnerSpawnEvent(@NotNull final Entity spawnee, @org.jetbrains.annotations.Nullable final CreatureSpawner spawner) { // Paper
+         super(spawnee);
+         this.spawner = spawner;
+     }
+ 
+-    @NotNull
++    /**
++     * Gets the spawner tile state, or null
++     * when the entity is spawned from a minecart
++     * spawner.
++     *
++     * @return the spawner tile state
++     */
++    @org.jetbrains.annotations.Nullable // Paper
+     public CreatureSpawner getSpawner() {
+         return spawner;
+     }
+diff --git a/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java b/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
++++ b/src/main/java/org/bukkit/event/hanging/HangingBreakByEntityEvent.java
+@@ -0,0 +0,0 @@ import org.jetbrains.annotations.Nullable;
+ public class HangingBreakByEntityEvent extends HangingBreakEvent {
+     private final Entity remover;
+ 
+-    public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @Nullable final Entity remover) {
++    public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @NotNull final Entity remover) { // Paper
+         this(hanging, remover, HangingBreakEvent.RemoveCause.ENTITY);
+     }
+ 
+-    public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @Nullable final Entity remover, @NotNull final HangingBreakEvent.RemoveCause cause) {
++    public HangingBreakByEntityEvent(@NotNull final Hanging hanging, @NotNull final Entity remover, @NotNull final HangingBreakEvent.RemoveCause cause) { // Paper
+         super(hanging, cause);
+         this.remover = remover;
+     }
+ 
+     /**
+      * Gets the entity that removed the hanging entity.
+-     * May be null, for example when broken by an explosion.
+      *
+      * @return the entity that removed the hanging entity
+      */
+-    @Nullable
++    @NotNull // Paper
+     public Entity getRemover() {
+         return remover;
+     }
+diff --git a/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java b/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
++++ b/src/main/java/org/bukkit/event/inventory/HopperInventorySearchEvent.java
+@@ -0,0 +0,0 @@ public class HopperInventorySearchEvent extends BlockEvent {
+         DESTINATION;
+     }
+ 
+-    public HopperInventorySearchEvent(@NotNull Inventory inventory, @NotNull ContainerType containerType, @NotNull Block hopper, @NotNull Block searchBlock) {
++    public HopperInventorySearchEvent(@Nullable Inventory inventory, @NotNull ContainerType containerType, @NotNull Block hopper, @NotNull Block searchBlock) { // Paper
+         super(hopper);
+         this.inventory = inventory;
+         this.containerType = containerType;
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
@@ -523,6 +605,28 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
      public Location getTo() {
          return to;
      }
+diff --git a/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java b/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
+index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
+--- a/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
++++ b/src/main/java/org/bukkit/event/raid/RaidSpawnWaveEvent.java
+@@ -0,0 +0,0 @@ public class RaidSpawnWaveEvent extends RaidEvent {
+     private final List<Raider> raiders;
+     private final Raider leader;
+ 
+-    public RaidSpawnWaveEvent(@NotNull Raid raid, @NotNull World world, @Nullable Raider leader, @NotNull List<Raider> raiders) {
++    public RaidSpawnWaveEvent(@NotNull Raid raid, @NotNull World world, @NotNull Raider leader, @NotNull List<Raider> raiders) { // Paper
+         super(raid, world);
+         this.raiders = raiders;
+         this.leader = leader;
+@@ -0,0 +0,0 @@ public class RaidSpawnWaveEvent extends RaidEvent {
+      *
+      * @return {@link Raider}
+      */
+-    @Nullable
++    @NotNull // Paper
+     public Raider getPatrolLeader() {
+         return leader;
+     }
 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