OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-22 14:35:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

[ci skip] Fix typos

Browse source
This commit is contained in:
Nassim Jahnke 2024-11-21 17:57:18 +01:00
parent c28d89d625
commit 55475f05d5
No known key found for this signature in database
GPG key ID: EF6771C01F6EF02F
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
patches/api/0353-More-Teleport-API.patch
View file

@ -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 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 new file mode 100644
index 0000000000000000000000000000000000000000..bbc006152ac7885e1ffd05e84073ac1af45cc1a3 index 0000000000000000000000000000000000000000..9dbbe1f3cfda3b1862fd9cf1ef9853329eda750c
--- /dev/null --- /dev/null
+++ b/src/main/java/io/papermc/paper/entity/TeleportFlag.java +++ b/src/main/java/io/papermc/paper/entity/TeleportFlag.java
@@ -0,0 +1,113 @@ @@ -0,0 +1,113 @@
@ -57,7 +57,7 @@ index 0000000000000000000000000000000000000000..bbc006152ac7885e1ffd05e84073ac1a
+ /** + /**
+ * Note: These flags only work on {@link org.bukkit.entity.Player} entities. + * Note: These flags only work on {@link org.bukkit.entity.Player} entities.
+ * <p> + * <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 + * @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. + * the position are non-applicable given teleports always expect an absolute location.
@ -65,19 +65,19 @@ index 0000000000000000000000000000000000000000..bbc006152ac7885e1ffd05e84073ac1a
+ */ + */
+ enum Relative implements 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, + 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, + 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, + 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; + VELOCITY_ROTATION;
+ /** + /**

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

@ -6,7 +6,7 @@ Subject: [PATCH] Only erase allay memory on non-item targets
Spigot incorrectly instanceOf checks the EntityTargetEvent#getTarget Spigot incorrectly instanceOf checks the EntityTargetEvent#getTarget
against the internal ItemEntity type and removes the nearest wanted item against the internal ItemEntity type and removes the nearest wanted item
memory if said instanceOf check fails, (which is always the case) 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. target item.
This commit fixes the faulty behaviour by instance performing a check This commit fixes the faulty behaviour by instance performing a check