Skip to content

Commit 3e8fb21

Browse files
Suggest PlayerPostRespawnEvent if changing player state (#6679)
1 parent ce1e7e8 commit 3e8fb21

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

patches/api/0176-Add-PlayerPostRespawnEvent.patch

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,17 @@ index 0000000000000000000000000000000000000000..31f34b54801f6699ce43355fa2a0a51f
6262
+ return handlers;
6363
+ }
6464
+}
65+
diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
66+
index d2be2ad2e3665728e614a89dd62ef9237f1d3ce6..e2c87a23e4743a34cfe911a71fd82b5a5ba1f9b7 100644
67+
--- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
68+
+++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
69+
@@ -8,6 +8,9 @@ import org.jetbrains.annotations.NotNull;
70+
71+
/**
72+
* Called when a player respawns.
73+
+ * <p>
74+
+ * If changing player state, see {@link com.destroystokyo.paper.event.player.PlayerPostRespawnEvent}
75+
+ * because the player is "reset" between this event and that event and some changes won't persist.
76+
*/
77+
public class PlayerRespawnEvent extends PlayerEvent {
78+
private static final HandlerList handlers = new HandlerList();

patches/api/0294-add-RespawnFlags-to-PlayerRespawnEvent.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
55

66

77
diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
8-
index d2be2ad2e3665728e614a89dd62ef9237f1d3ce6..359e385bd6854a4b146cd0a54badb9c3d31ca12d 100644
8+
index e2c87a23e4743a34cfe911a71fd82b5a5ba1f9b7..a951568def24f809a6a019eefe623974c1867e22 100644
99
--- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
1010
+++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
11-
@@ -14,17 +14,30 @@ public class PlayerRespawnEvent extends PlayerEvent {
11+
@@ -17,17 +17,30 @@ public class PlayerRespawnEvent extends PlayerEvent {
1212
private Location respawnLocation;
1313
private final boolean isBedSpawn;
1414
private final boolean isAnchorSpawn;
@@ -39,7 +39,7 @@ index d2be2ad2e3665728e614a89dd62ef9237f1d3ce6..359e385bd6854a4b146cd0a54badb9c3
3939
}
4040

4141
/**
42-
@@ -77,4 +90,31 @@ public class PlayerRespawnEvent extends PlayerEvent {
42+
@@ -80,4 +93,31 @@ public class PlayerRespawnEvent extends PlayerEvent {
4343
public static HandlerList getHandlerList() {
4444
return handlers;
4545
}

0 commit comments

Comments
 (0)