More Teleport API
This commit is contained in:
@@ -126,10 +126,32 @@ public interface Entity extends Metadatable, CommandSender, Nameable, Persistent
|
||||
*
|
||||
* @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
|
||||
* @param teleportFlags Flags to be used in this teleportation
|
||||
* @return <code>true</code> if the teleport was successful
|
||||
*/
|
||||
default boolean teleport(@NotNull Location location, @NotNull io.papermc.paper.entity.TeleportFlag @NotNull... teleportFlags) {
|
||||
return this.teleport(location, TeleportCause.PLUGIN, teleportFlags);
|
||||
}
|
||||
|
||||
/**
|
||||
* Teleports this entity to the given location.
|
||||
*
|
||||
* @param location New location to teleport this entity to
|
||||
* @param cause The cause of this teleportation
|
||||
* @param teleportFlags Flags to be used in this teleportation
|
||||
* @return <code>true</code> if the teleport was successful
|
||||
*/
|
||||
boolean teleport(@NotNull Location location, @NotNull TeleportCause cause, @NotNull io.papermc.paper.entity.TeleportFlag @NotNull... teleportFlags);
|
||||
// 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.
|
||||
|
||||
@@ -3561,6 +3561,45 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
|
||||
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);
|
||||
|
||||
/**
|
||||
* Causes the player to look towards the given position.
|
||||
*
|
||||
* @param position Position to look at in the player's current world
|
||||
* @param playerAnchor What part of the player should face the given position
|
||||
*/
|
||||
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);
|
||||
}
|
||||
|
||||
/**
|
||||
* 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();
|
||||
|
||||
@@ -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;
|
||||
private final java.util.Set<io.papermc.paper.entity.TeleportFlag.Relative> teleportFlagSet;
|
||||
// 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) {
|
||||
@@ -23,6 +29,15 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
|
||||
this.cause = cause;
|
||||
}
|
||||
|
||||
// Paper start - Teleport API
|
||||
@org.jetbrains.annotations.ApiStatus.Internal
|
||||
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) {
|
||||
super(player, from, to);
|
||||
this.teleportFlagSet = teleportFlagSet;
|
||||
this.cause = cause;
|
||||
}
|
||||
// Paper end
|
||||
|
||||
/**
|
||||
* Gets the cause of this teleportation event
|
||||
*
|
||||
@@ -88,6 +103,30 @@ public class PlayerTeleportEvent extends PlayerMoveEvent {
|
||||
UNKNOWN;
|
||||
}
|
||||
|
||||
// Paper start - Teleport API
|
||||
/**
|
||||
* Gets if the player will be dismounted in this teleportation.
|
||||
*
|
||||
* @return dismounted or not
|
||||
* @deprecated dismounting on tp is no longer controlled by the server
|
||||
*/
|
||||
@Deprecated(forRemoval = true)
|
||||
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
|
||||
public java.util.Set<io.papermc.paper.entity.TeleportFlag.@NotNull Relative> getRelativeTeleportationFlags() {
|
||||
return this.teleportFlagSet;
|
||||
}
|
||||
// Paper end
|
||||
|
||||
@NotNull
|
||||
@Override
|
||||
public HandlerList getHandlers() {
|
||||
|
||||
Reference in New Issue
Block a user