mirror of
https://github.com/PaperMC/Paper.git
synced 2024-07-01 01:04:57 +02:00
928bcc8d3a
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: 09943450 Update SnakeYAML version 5515734f SPIGOT-7162: Incorrect description for Entity#getVehicle javadoc 6f82b381 PR-788: Add getHand() to all relevant events CraftBukkit Changes: aaf484f6f SPIGOT-7163: CraftMerchantRecipe doesn't copy demand and specialPrice from BukkitMerchantRecipe 5329dd6fd PR-1107: Add getHand() to all relevant events 93061706e SPIGOT-7045: Ocelots never spawn with babies with spawn reason OCELOT_BABY
79 lines
2.8 KiB
Diff
79 lines
2.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: MisterVector <whizkid3000@hotmail.com>
|
|
Date: Fri, 26 Oct 2018 21:33:13 -0700
|
|
Subject: [PATCH] Add PlayerPostRespawnEvent
|
|
|
|
|
|
diff --git a/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
|
|
new file mode 100644
|
|
index 0000000000000000000000000000000000000000..31f34b54801f6699ce43355fa2a0a51f1ad0c997
|
|
--- /dev/null
|
|
+++ b/src/main/java/com/destroystokyo/paper/event/player/PlayerPostRespawnEvent.java
|
|
@@ -0,0 +1,52 @@
|
|
+package com.destroystokyo.paper.event.player;
|
|
+
|
|
+import org.bukkit.Location;
|
|
+import org.bukkit.entity.Player;
|
|
+import org.bukkit.event.HandlerList;
|
|
+import org.bukkit.event.player.PlayerEvent;
|
|
+import org.jetbrains.annotations.NotNull;
|
|
+
|
|
+/**
|
|
+ * Fired after a player has respawned
|
|
+ */
|
|
+public class PlayerPostRespawnEvent extends PlayerEvent {
|
|
+ private final static HandlerList handlers = new HandlerList();
|
|
+ private final Location respawnedLocation;
|
|
+ private final boolean isBedSpawn;
|
|
+
|
|
+ public PlayerPostRespawnEvent(@NotNull final Player respawnPlayer, @NotNull final Location respawnedLocation, final boolean isBedSpawn) {
|
|
+ super(respawnPlayer);
|
|
+ this.respawnedLocation = respawnedLocation;
|
|
+ this.isBedSpawn = isBedSpawn;
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Returns the location of the respawned player
|
|
+ *
|
|
+ * @return location of the respawned player
|
|
+ */
|
|
+ @NotNull
|
|
+ public Location getRespawnedLocation() {
|
|
+ return respawnedLocation.clone();
|
|
+ }
|
|
+
|
|
+ /**
|
|
+ * Checks if the player respawned to their bed
|
|
+ *
|
|
+ * @return whether the player respawned to their bed
|
|
+ */
|
|
+ public boolean isBedSpawn() {
|
|
+ return isBedSpawn;
|
|
+ }
|
|
+
|
|
+ @Override
|
|
+ @NotNull
|
|
+ public HandlerList getHandlers() {
|
|
+ return handlers;
|
|
+ }
|
|
+
|
|
+ @NotNull
|
|
+ public static HandlerList getHandlerList() {
|
|
+ return handlers;
|
|
+ }
|
|
+}
|
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
|
|
index 7c2cec60cbaf199416496292f2264fa3864b499c..f5bdb5244c8d993c624f938c8fb7ccff74655d75 100644
|
|
--- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
|
|
+++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
|
|
@@ -8,6 +8,9 @@ import org.jetbrains.annotations.NotNull;
|
|
|
|
/**
|
|
* Called when a player respawns.
|
|
+ * <p>
|
|
+ * If changing player state, see {@link com.destroystokyo.paper.event.player.PlayerPostRespawnEvent}
|
|
+ * because the player is "reset" between this event and that event and some changes won't persist.
|
|
*/
|
|
public class PlayerRespawnEvent extends PlayerEvent {
|
|
private static final HandlerList handlers = new HandlerList();
|