2022-07-22 19:36:43 +00:00
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Owen1212055 <23108066+Owen1212055@users.noreply.github.com>
Date: Sun, 5 Sep 2021 00:36:05 -0400
Subject: [PATCH] More Teleport API
diff --git a/src/main/java/io/papermc/paper/entity/LookAnchor.java b/src/main/java/io/papermc/paper/entity/LookAnchor.java
new file mode 100644
2023-11-28 19:40:25 +00:00
index 0000000000000000000000000000000000000000..544eec787ea837f7d29df6519255840d6fe087d7
2022-07-22 19:36:43 +00:00
--- /dev/null
+++ b/src/main/java/io/papermc/paper/entity/LookAnchor.java
2023-11-28 19:40:25 +00:00
@@ -0,0 +1,24 @@
2022-07-22 19:36:43 +00:00
+package io.papermc.paper.entity;
+
2023-05-03 11:07:51 +00:00
+import io.papermc.paper.math.Position;
2022-07-22 19:36:43 +00:00
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+
+/**
2023-05-03 11:07:51 +00:00
+ * Represents what part of the entity should be used when determining where to face a position/entity.
2022-07-22 19:36:43 +00:00
+ *
2023-05-03 11:07:51 +00:00
+ * @see org.bukkit.entity.Player#lookAt(Position, LookAnchor)
2022-07-22 19:36:43 +00:00
+ * @see org.bukkit.entity.Player#lookAt(Entity, LookAnchor, LookAnchor)
+ */
+public enum LookAnchor {
+ /**
+ * Represents the entity's feet.
+ * @see LivingEntity#getLocation()
+ */
+ FEET,
+ /**
+ * Represents the entity's eyes.
+ * @see LivingEntity#getEyeLocation()
+ */
+ EYES;
+}
2023-03-04 22:07:23 +00:00
diff --git a/src/main/java/io/papermc/paper/entity/TeleportFlag.java b/src/main/java/io/papermc/paper/entity/TeleportFlag.java
2022-07-22 19:36:43 +00:00
new file mode 100644
2023-11-28 19:40:25 +00:00
index 0000000000000000000000000000000000000000..c8b5b570d44da9524bfc59c7e11b2ae59d4b79b9
2022-07-22 19:36:43 +00:00
--- /dev/null
2023-03-04 22:07:23 +00:00
+++ b/src/main/java/io/papermc/paper/entity/TeleportFlag.java
2023-11-28 19:40:25 +00:00
@@ -0,0 +1,79 @@
2022-07-22 19:36:43 +00:00
+package io.papermc.paper.entity;
+
+import org.bukkit.Location;
+import org.bukkit.event.player.PlayerTeleportEvent;
+
+/**
2023-03-04 22:07:23 +00:00
+ * Represents a flag that can be set on teleportation that may
+ * slightly modify the behavior.
2022-07-22 19:36:43 +00:00
+ *
2023-03-04 22:07:23 +00:00
+ * @see EntityState
+ * @see Relative
2022-07-22 19:36:43 +00:00
+ */
2023-03-04 22:07:23 +00:00
+public sealed interface TeleportFlag permits TeleportFlag.EntityState, TeleportFlag.Relative {
+
2022-07-22 19:36:43 +00:00
+ /**
2023-03-04 22:07:23 +00:00
+ * Note: These flags only work on {@link org.bukkit.entity.Player} entities.
+ * <p>
+ * Represents coordinates in a teleportation that should be handled relatively.
+ * <p>
+ * Coordinates of the location that the client should handle as relative teleportation
+ * Relative teleportation flags are only used client side, and cause the player to not lose velocity in that
+ * specific coordinate. The location of the teleportation will not change.
+ *
+ * @see org.bukkit.entity.Player#teleport(Location, PlayerTeleportEvent.TeleportCause, TeleportFlag...)
2022-07-22 19:36:43 +00:00
+ */
2023-03-04 22:07:23 +00:00
+ enum Relative implements TeleportFlag {
+ /**
+ * Represents the player's X coordinate
+ */
+ X,
+ /**
+ * Represents the player's Y coordinate
+ */
+ Y,
+ /**
+ * Represents the player's Z coordinate
+ */
+ Z,
+ /**
+ * Represents the player's yaw
+ */
+ YAW,
+ /**
+ * Represents the player's pitch
+ */
+ PITCH;
+ }
+
2022-07-22 19:36:43 +00:00
+ /**
2023-03-04 22:07:23 +00:00
+ * Represents flags that effect the entity's state on
+ * teleportation.
2022-07-22 19:36:43 +00:00
+ */
2023-03-04 22:07:23 +00:00
+ enum EntityState implements TeleportFlag {
+ /**
+ * If all passengers should not be required to be removed prior to teleportation.
+ * <p>
+ * Note:
+ * Teleporting to a different world with this flag present while the entity has entities riding it
+ * will cause this teleportation to return false and not occur.
+ */
+ RETAIN_PASSENGERS,
+ /**
+ * If the entity should not be dismounted if they are riding another entity.
+ * <p>
+ * Note:
+ * Teleporting to a different world with this flag present while this entity is riding another entity will
+ * cause this teleportation to return false and not occur.
+ */
+ RETAIN_VEHICLE,
+ /**
+ * Indicates that a player should not have their current open inventory closed when teleporting.
+ * <p>
+ * Note:
+ * This option will be ignored when teleported to a different world.
+ */
+ RETAIN_OPEN_INVENTORY;
+ }
2022-07-22 19:36:43 +00:00
+
+}
diff --git a/src/main/java/org/bukkit/entity/Entity.java b/src/main/java/org/bukkit/entity/Entity.java
Updated Upstream (Bukkit/CraftBukkit/Spigot) (#10277)
Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
Bukkit Changes:
9a80d38c SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-722: Add EntityRemoveEvent
258086d9 SPIGOT-7417, PR-967: Add Sign#getTargetSide and Sign#getAllowedEditor
ffaba051 SPIGOT-7584: Add missing Tag.ITEMS_NON_FLAMMABLE_WOOD
CraftBukkit Changes:
98b6c1ac7 SPIGOT-7589 Fix NullPointerException when bans expire
a2736ddb0 SPIGOT-336, SPIGOT-3366, SPIGOT-5768, SPIGOT-6409, SPIGOT-6861, PR-1008: Add EntityRemoveEvent
5bf12cb89 SPIGOT-7565: Throw a more descriptive error message when a developer tries to spawn an entity from a CraftBukkit class
76d95fe7e SPIGOT-7417, PR-1343: Add Sign#getTargetSide and Sign#getAllowedEditor
Spigot Changes:
e9ec5485 Rebuild patches
f1b62e0c Rebuild patches
2024-02-23 13:37:33 +00:00
index e1fe5d93eb7a1f96954d907dbbe0758f25bd1ce7..948d6a08ff459afd5d4d5b151c41d94d1d5847b6 100644
2022-07-22 19:36:43 +00:00
--- a/src/main/java/org/bukkit/entity/Entity.java
+++ b/src/main/java/org/bukkit/entity/Entity.java
2023-12-05 17:33:18 +00:00
@@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
2022-07-22 19:36:43 +00:00
*
* @param yaw the yaw
* @param pitch the pitch
- * @throws UnsupportedOperationException if used for players
*/
public void setRotation(float yaw, float pitch);
+ // Paper start - Teleport API
+ /**
+ * Teleports this entity to the given location.
+ *
+ * @param location New location to teleport this entity to
2023-03-04 22:07:23 +00:00
+ * @param teleportFlags Flags to be used in this teleportation
2022-07-22 19:36:43 +00:00
+ * @return <code>true</code> if the teleport was successful
+ */
2023-03-04 22:07:23 +00:00
+ default boolean teleport(@NotNull Location location, @NotNull io.papermc.paper.entity.TeleportFlag @NotNull... teleportFlags) {
+ return this.teleport(location, TeleportCause.PLUGIN, teleportFlags);
2022-07-22 19:36:43 +00:00
+ }
+
+ /**
+ * Teleports this entity to the given location.
+ *
+ * @param location New location to teleport this entity to
+ * @param cause The cause of this teleportation
2023-03-04 22:07:23 +00:00
+ * @param teleportFlags Flags to be used in this teleportation
2022-07-22 19:36:43 +00:00
+ * @return <code>true</code> if the teleport was successful
+ */
2023-03-04 22:07:23 +00:00
+ boolean teleport(@NotNull Location location, @NotNull TeleportCause cause, @NotNull io.papermc.paper.entity.TeleportFlag @NotNull... teleportFlags);
2022-07-22 19:36:43 +00:00
+ // Paper end - Teleport API
+
/**
* Teleports this entity to the given location. If this entity is riding a
* vehicle, it will be dismounted prior to teleportation.
diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
2024-03-03 20:54:52 +00:00
index 2501533048e4de25672d9cc0a52fa1150e6d8adb..d598eb27f131a265c163ea96ab5fb56d4cf6ecb9 100644
2022-07-22 19:36:43 +00:00
--- a/src/main/java/org/bukkit/entity/Player.java
+++ b/src/main/java/org/bukkit/entity/Player.java
2024-03-03 20:54:52 +00:00
@@ -3424,6 +3424,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
2022-07-22 19:36:43 +00:00
String getClientBrandName();
// Paper end
+ // Paper start - Teleport API
+ /**
+ * Sets the player's rotation.
+ *
+ * @param yaw the yaw
+ * @param pitch the pitch
+ */
+ void setRotation(float yaw, float pitch);
+
+ /**
+ * Causes the player to look towards the given position.
+ *
+ * @param x x coordinate
+ * @param y y coordinate
+ * @param z z coordinate
+ * @param playerAnchor What part of the player should face the given position
+ */
+ void lookAt(double x, double y, double z, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor);
+
+ /**
2023-05-03 11:07:51 +00:00
+ * Causes the player to look towards the given position.
2022-07-22 19:36:43 +00:00
+ *
2023-03-04 22:07:23 +00:00
+ * @param position Position to look at in the player's current world
2023-05-03 11:07:51 +00:00
+ * @param playerAnchor What part of the player should face the given position
2022-07-22 19:36:43 +00:00
+ */
2023-03-04 22:07:23 +00:00
+ default void lookAt(@NotNull io.papermc.paper.math.Position position, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor) {
+ this.lookAt(position.x(), position.y(), position.z(), playerAnchor);
2022-07-22 19:36:43 +00:00
+ }
+
+ /**
+ * Causes the player to look towards the given entity.
+ *
+ * @param entity Entity to look at
+ * @param playerAnchor What part of the player should face the entity
+ * @param entityAnchor What part of the entity the player should face
+ */
+ void lookAt(@NotNull org.bukkit.entity.Entity entity, @NotNull io.papermc.paper.entity.LookAnchor playerAnchor, @NotNull io.papermc.paper.entity.LookAnchor entityAnchor);
+ // Paper end - Teleport API
+
@NotNull
@Override
Spigot spigot();
diff --git a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
2023-11-28 19:40:25 +00:00
index 2deae344c88920ab95eefd2f65df5c858e04750b..ccfb08af8c57ddac3062c2cec28d7ff428082709 100644
2022-07-22 19:36:43 +00:00
--- a/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
+++ b/src/main/java/org/bukkit/event/player/PlayerTeleportEvent.java
@@ -13,8 +13,14 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
private static final HandlerList handlers = new HandlerList();
private TeleportCause cause = TeleportCause.UNKNOWN;
+ // Paper start - Teleport API
+ private boolean dismounted = true;
2023-03-04 22:07:23 +00:00
+ private final java.util.Set<io.papermc.paper.entity.TeleportFlag.Relative> teleportFlagSet;
2022-07-22 19:36:43 +00:00
+ // Paper end
+
public PlayerTeleportEvent(@NotNull final Player player, @NotNull final Location from, @Nullable final Location to) {
super(player, from, to);
+ teleportFlagSet = java.util.Collections.emptySet(); // Paper - Teleport API
}
public PlayerTeleportEvent(@NotNull final Player player, @NotNull final Location from, @Nullable final Location to, @NotNull final TeleportCause cause) {
2023-03-14 23:10:18 +00:00
@@ -23,6 +29,15 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
2022-07-22 19:36:43 +00:00
this.cause = cause;
}
+ // Paper start - Teleport API
2023-11-28 19:40:25 +00:00
+ @org.jetbrains.annotations.ApiStatus.Internal
2023-03-14 23:10:18 +00:00
+ public PlayerTeleportEvent(@NotNull final Player player, @NotNull final Location from, @Nullable final Location to, @NotNull final TeleportCause cause, @NotNull java.util.Set<io.papermc.paper.entity.TeleportFlag.@NotNull Relative> teleportFlagSet) {
2022-07-22 19:36:43 +00:00
+ super(player, from, to);
+ this.teleportFlagSet = teleportFlagSet;
+ this.cause = cause;
+ }
+ // Paper end
+
/**
* Gets the cause of this teleportation event
*
2023-11-28 19:40:25 +00:00
@@ -88,6 +103,30 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
2022-07-22 19:36:43 +00:00
UNKNOWN;
}
+ // Paper start - Teleport API
+ /**
+ * Gets if the player will be dismounted in this teleportation.
+ *
+ * @return dismounted or not
2023-03-14 23:10:18 +00:00
+ * @deprecated dismounting on tp is no longer controlled by the server
2022-07-22 19:36:43 +00:00
+ */
2023-03-14 23:10:18 +00:00
+ @Deprecated(forRemoval = true)
2022-07-22 19:36:43 +00:00
+ public boolean willDismountPlayer() {
+ return this.dismounted;
+ }
+
+ /**
+ * Returns the relative teleportation flags used in this teleportation.
+ * This determines which axis the player will not lose their velocity in.
+ *
+ * @return an immutable set of relative teleportation flags
+ */
+ @NotNull
2023-03-04 22:07:23 +00:00
+ public java.util.Set<io.papermc.paper.entity.TeleportFlag.@NotNull Relative> getRelativeTeleportationFlags() {
2022-07-22 19:36:43 +00:00
+ return this.teleportFlagSet;
+ }
+ // Paper end
+
@NotNull
@Override
public HandlerList getHandlers() {