[pull] master from PaperMC:master

patches/api/0353-More-Teleport-API.patch

@@ -36,7 +36,7 @@ index 0000000000000000000000000000000000000000..544eec787ea837f7d29df6519255840d
 +}
 diff --git a/src/main/java/io/papermc/paper/entity/TeleportFlag.java b/src/main/java/io/papermc/paper/entity/TeleportFlag.java
 new file mode 100644
-index 0000000000000000000000000000000000000000..bbc006152ac7885e1ffd05e84073ac1af45cc1a3
+index 0000000000000000000000000000000000000000..9dbbe1f3cfda3b1862fd9cf1ef9853329eda750c
 --- /dev/null
 +++ b/src/main/java/io/papermc/paper/entity/TeleportFlag.java
 @@ -0,0 +1,113 @@
@@ -57,27 +57,27 @@ index 0000000000000000000000000000000000000000..bbc006152ac7885e1ffd05e84073ac1a
 +    /**
 +     * Note: These flags only work on {@link org.bukkit.entity.Player} entities.
 +     * <p>
-+     * Relative flags enable a player to not loose their velocity in the flag-specific axis/context when teleporting.
++     * Relative flags enable a player to not lose their velocity in the flag-specific axis/context when teleporting.
 +     *
 +     * @apiNote The relative flags exposed in the API do *not* mirror all flags known to vanilla, as relative flags concerning
 +     * the position are non-applicable given teleports always expect an absolute location.
 +     * @see org.bukkit.entity.Player#teleport(Location, PlayerTeleportEvent.TeleportCause, TeleportFlag...)
 +     */
 +    enum Relative implements TeleportFlag {
 +        /**
-+         * Configures the player to not loose velocity in their x axis during the teleport.
++         * Configures the player to not lose velocity in their x axis during the teleport.
 +         */
 +        VELOCITY_X,
 +        /**
-+         * Configures the player to not loose velocity in their y axis during the teleport.
++         * Configures the player to not lose velocity in their y axis during the teleport.
 +         */
 +        VELOCITY_Y,
 +        /**
-+         * Configures the player to not loose velocity in their z axis during the teleport.
++         * Configures the player to not lose velocity in their z axis during the teleport.
 +         */
 +        VELOCITY_Z,
 +        /**
-+         * Configures the player to not loose velocity in their current rotation during the teleport.
++         * Configures the player to not lose velocity in their current rotation during the teleport.
 +         */
 +        VELOCITY_ROTATION;
 +        /**

patches/server/0040-Add-more-entities-to-activation-range-ignore-list.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Add more entities to activation range ignore list
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 0338ceaddc1a0921f5f8796d5eac75c301bafac2..bd522080d17b5b470ec3ab42aa4ecc3082248c8a 100644
+index 0338ceaddc1a0921f5f8796d5eac75c301bafac2..3184090cfa1ce6ec01686a7651be01cff49f5951 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -92,6 +92,9 @@ public class ActivationRange
@@ -14,7 +14,7 @@ index 0338ceaddc1a0921f5f8796d5eac75c301bafac2..bd522080d17b5b470ec3ab42aa4ecc30
                  || entity instanceof PrimedTnt
 +                || entity instanceof net.minecraft.world.entity.item.FallingBlockEntity // Paper - Always tick falling blocks
 +                || entity instanceof net.minecraft.world.entity.vehicle.AbstractMinecart // Paper
-+                || entity instanceof net.minecraft.world.entity.vehicle.Boat // Paper
++                || entity instanceof net.minecraft.world.entity.vehicle.AbstractBoat // Paper
                  || entity instanceof EndCrystal
                  || entity instanceof FireworkRocketEntity
                  || entity instanceof ThrownTrident )

patches/server/0835-Only-erase-allay-memory-on-non-item-targets.patch

@@ -6,7 +6,7 @@ Subject: [PATCH] Only erase allay memory on non-item targets
 Spigot incorrectly instanceOf checks the EntityTargetEvent#getTarget
 against the internal ItemEntity type and removes the nearest wanted item
 memory if said instanceOf check fails, (which is always the case)
-causing allays to behave differently as they constantly loose their
+causing allays to behave differently as they constantly lose their
 target item.
 
 This commit fixes the faulty behaviour by instance performing a check

patches/server/1046-Bundle-spark.patch

@@ -5,7 +5,7 @@ Subject: [PATCH] Bundle spark
 
 
 diff --git a/build.gradle.kts b/build.gradle.kts
-index 9e6c2a4630ce75e4115f76b5e7a1e0b50e8b3197..ee5f662ed0e84be997807a9faf97191ef4fc0449 100644
+index 9e6c2a4630ce75e4115f76b5e7a1e0b50e8b3197..faf3e3fd72e8c915e7a4803dacbe1bb576c6663e 100644
 --- a/build.gradle.kts
 +++ b/build.gradle.kts
 @@ -76,6 +76,10 @@ dependencies {
@@ -14,7 +14,7 @@ index 9e6c2a4630ce75e4115f76b5e7a1e0b50e8b3197..ee5f662ed0e84be997807a9faf97191e
      // Paper end - Remap reflection
 +    // Paper start - spark
 +    implementation("me.lucko:spark-api:0.1-20240720.200737-2")
-+    implementation("me.lucko:spark-paper:1.10.105-SNAPSHOT")
++    implementation("me.lucko:spark-paper:1.10.119-SNAPSHOT")
 +    // Paper end - spark
  }