aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorNassim Jahnke <[email protected]>2024-11-21 17:57:18 +0100
committerNassim Jahnke <[email protected]>2024-11-21 17:57:18 +0100
commit55475f05d59bcaf5fd3ff64a6a29c0f913c7f712 (patch)
tree7b85407dcb3c48f3630b9d5d973fca44d341200f
parentc28d89d625c60243c52857e0c7e6398b73602156 (diff)
downloadPaper-55475f05d59bcaf5fd3ff64a6a29c0f913c7f712.tar.gz
Paper-55475f05d59bcaf5fd3ff64a6a29c0f913c7f712.zip
[ci skip] Fix typos
-rw-r--r--patches/api/0353-More-Teleport-API.patch12
-rw-r--r--patches/server/0835-Only-erase-allay-memory-on-non-item-targets.patch2
2 files changed, 7 insertions, 7 deletions
diff --git a/patches/api/0353-More-Teleport-API.patch b/patches/api/0353-More-Teleport-API.patch
index 83cd2cd870..84e42259e2 100644
--- a/patches/api/0353-More-Teleport-API.patch
+++ b/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,7 +57,7 @@ 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.
@@ -65,19 +65,19 @@ index 0000000000000000000000000000000000000000..bbc006152ac7885e1ffd05e84073ac1a
+ */
+ 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;
+ /**
diff --git a/patches/server/0835-Only-erase-allay-memory-on-non-item-targets.patch b/patches/server/0835-Only-erase-allay-memory-on-non-item-targets.patch
index 581af491b6..6342f7dee7 100644
--- a/patches/server/0835-Only-erase-allay-memory-on-non-item-targets.patch
+++ b/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