2021-08-06 22:37:38 +02:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
|
|
|
Date: Wed, 19 May 2021 18:58:24 -0700
|
|
|
|
Subject: [PATCH] Add PlayerSetSpawnEvent
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java
|
|
|
|
new file mode 100644
|
2024-02-01 10:15:57 +01:00
|
|
|
index 0000000000000000000000000000000000000000..6a823008deaf26f751e598bc967f19c15525acce
|
2021-08-06 22:37:38 +02:00
|
|
|
--- /dev/null
|
|
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerSetSpawnEvent.java
|
2024-02-01 10:15:57 +01:00
|
|
|
@@ -0,0 +1,178 @@
|
2021-08-06 22:37:38 +02:00
|
|
|
+package com.destroystokyo.paper.event.player;
|
|
|
|
+
|
|
|
|
+import net.kyori.adventure.text.Component;
|
|
|
|
+import org.bukkit.Location;
|
|
|
|
+import org.bukkit.entity.Player;
|
|
|
|
+import org.bukkit.event.Cancellable;
|
|
|
|
+import org.bukkit.event.HandlerList;
|
|
|
|
+import org.bukkit.event.player.PlayerEvent;
|
2024-02-01 10:15:57 +01:00
|
|
|
+import org.jetbrains.annotations.ApiStatus;
|
2021-08-06 22:37:38 +02:00
|
|
|
+import org.jetbrains.annotations.NotNull;
|
|
|
|
+import org.jetbrains.annotations.Nullable;
|
|
|
|
+
|
|
|
|
+/**
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * Called when a player's spawn is set, either by themselves or otherwise.
|
|
|
|
+ * <br>
|
2021-08-06 22:37:38 +02:00
|
|
|
+ * Cancelling this event will prevent the spawn from being set.
|
|
|
|
+ */
|
|
|
|
+public class PlayerSetSpawnEvent extends PlayerEvent implements Cancellable {
|
|
|
|
+
|
|
|
|
+ private static final HandlerList HANDLER_LIST = new HandlerList();
|
|
|
|
+
|
|
|
|
+ private final Cause cause;
|
|
|
|
+ private Location location;
|
|
|
|
+ private boolean forced;
|
|
|
|
+ private boolean notifyPlayer;
|
|
|
|
+ private Component notification;
|
|
|
|
+
|
|
|
|
+ private boolean cancelled;
|
|
|
|
+
|
2024-02-01 10:15:57 +01:00
|
|
|
+ @ApiStatus.Internal
|
|
|
|
+ public PlayerSetSpawnEvent(@NotNull Player player, @NotNull Cause cause, @Nullable Location location, boolean forced, boolean notifyPlayer, @Nullable Component notification) {
|
|
|
|
+ super(player);
|
2021-08-06 22:37:38 +02:00
|
|
|
+ this.cause = cause;
|
|
|
|
+ this.location = location;
|
|
|
|
+ this.forced = forced;
|
|
|
|
+ this.notifyPlayer = notifyPlayer;
|
|
|
|
+ this.notification = notification;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the cause of this event.
|
|
|
|
+ *
|
|
|
|
+ * @return the cause
|
|
|
|
+ */
|
|
|
|
+ @NotNull
|
|
|
|
+ public Cause getCause() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.cause;
|
2021-08-06 22:37:38 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the location that the spawn is set to. The yaw
|
2022-04-30 22:24:47 +02:00
|
|
|
+ * of this location is the spawn angle. Mutating this location
|
|
|
|
+ * will change the resulting spawn point of the player. Use
|
|
|
|
+ * {@link Location#clone()} to get a copy of this location.
|
2021-08-06 22:37:38 +02:00
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @return the spawn location, or {@code null} if removing the location
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ @Nullable
|
|
|
|
+ public Location getLocation() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.location;
|
2021-08-06 22:37:38 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets the location to be set as the spawn location. The yaw
|
|
|
|
+ * of this location is the spawn angle.
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @param location the spawn location, or {@code null} to remove the spawn location
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ public void setLocation(@Nullable Location location) {
|
|
|
|
+ this.location = location;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets if this is a force spawn location
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @return {@code true} if forced
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ public boolean isForced() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.forced;
|
2021-08-06 22:37:38 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets if this is a forced spawn location
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @param forced {@code true} to force
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ public void setForced(boolean forced) {
|
|
|
|
+ this.forced = forced;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets if this action will notify the player their spawn
|
|
|
|
+ * has been set.
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @return {@code true} to notify
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ public boolean willNotifyPlayer() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.notifyPlayer;
|
2021-08-06 22:37:38 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets if this action will notify the player that their spawn
|
|
|
|
+ * has been set.
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @param notifyPlayer {@code true} to notify
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ public void setNotifyPlayer(boolean notifyPlayer) {
|
|
|
|
+ this.notifyPlayer = notifyPlayer;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Gets the notification message that will be sent to the player
|
|
|
|
+ * if {@link #willNotifyPlayer()} returns true.
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @return {@code null} if no notification
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ @Nullable
|
|
|
|
+ public Component getNotification() {
|
2024-02-01 10:15:57 +01:00
|
|
|
+ return this.notification;
|
2021-08-06 22:37:38 +02:00
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Sets the notification message that will be sent to the player.
|
|
|
|
+ *
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * @param notification {@code null} to send no message
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ public void setNotification(@Nullable Component notification) {
|
|
|
|
+ this.notification = notification;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public boolean isCancelled() {
|
|
|
|
+ return this.cancelled;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public void setCancelled(boolean cancel) {
|
|
|
|
+ this.cancelled = cancel;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public @NotNull HandlerList getHandlers() {
|
|
|
|
+ return HANDLER_LIST;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @NotNull
|
|
|
|
+ public static HandlerList getHandlerList() {
|
|
|
|
+ return HANDLER_LIST;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public enum Cause {
|
|
|
|
+ /**
|
|
|
|
+ * When a player interacts successfully with a bed.
|
|
|
|
+ */
|
|
|
|
+ BED,
|
|
|
|
+ /**
|
|
|
|
+ * When a player interacts successfully with a respawn anchor.
|
|
|
|
+ */
|
|
|
|
+ RESPAWN_ANCHOR,
|
|
|
|
+ /**
|
|
|
|
+ * When a player respawns.
|
|
|
|
+ */
|
|
|
|
+ PLAYER_RESPAWN,
|
|
|
|
+ /**
|
|
|
|
+ * When the {@code /spawnpoint} command is used on a player.
|
|
|
|
+ */
|
|
|
|
+ COMMAND,
|
|
|
|
+ /**
|
2024-02-01 10:15:57 +01:00
|
|
|
+ * When a plugin uses {@link Player#setRespawnLocation(Location)} or
|
|
|
|
+ * {@link Player#setRespawnLocation(Location, boolean)}.
|
2021-08-06 22:37:38 +02:00
|
|
|
+ */
|
|
|
|
+ PLUGIN,
|
|
|
|
+ /**
|
|
|
|
+ * Fallback cause.
|
|
|
|
+ */
|
|
|
|
+ UNKNOWN,
|
|
|
|
+ }
|
|
|
|
+}
|
2023-05-12 13:10:08 +02:00
|
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java b/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
|
|
|
|
index c2884bc20f0040b15dc035f4761d021e7343960d..3ea03540ce2882bbb482d9bd69a015a7fc040bfd 100644
|
|
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
|
|
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerSpawnChangeEvent.java
|
|
|
|
@@ -12,8 +12,10 @@ import org.jetbrains.annotations.Nullable;
|
|
|
|
/**
|
|
|
|
* This event is fired when the spawn point of the player is changed.
|
|
|
|
* @apiNote draft API
|
|
|
|
+ * @deprecated use {@link com.destroystokyo.paper.event.player.PlayerSetSpawnEvent}
|
|
|
|
*/
|
|
|
|
@ApiStatus.Experimental
|
|
|
|
+@Deprecated(forRemoval = true) // Paper
|
|
|
|
public class PlayerSpawnChangeEvent extends PlayerEvent implements Cancellable {
|
|
|
|
|
|
|
|
private static final HandlerList handlers = new HandlerList();
|