Add RespawnFlags to PlayerRespawnEvent (#5533)
This commit is contained in:
Jake Potrebic
GitHub
parent
7579c26678
commit
f56989c97d
2 changed files with 114 additions and 0 deletions
|
|
@ -0,0 +1,73 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
Date: Thu, 22 Apr 2021 17:17:54 -0700
|
||||||
|
Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
|
||||||
|
index d2be2ad2e3665728e614a89dd62ef9237f1d3ce6..359e385bd6854a4b146cd0a54badb9c3d31ca12d 100644
|
||||||
|
--- a/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
|
||||||
|
+++ b/src/main/java/org/bukkit/event/player/PlayerRespawnEvent.java
|
||||||
|
@@ -14,17 +14,30 @@ public class PlayerRespawnEvent extends PlayerEvent {
|
||||||
|
private Location respawnLocation;
|
||||||
|
private final boolean isBedSpawn;
|
||||||
|
private final boolean isAnchorSpawn;
|
||||||
|
+ private final java.util.Set<RespawnFlag> respawnFlags; // Paper
|
||||||
|
|
||||||
|
@Deprecated
|
||||||
|
public PlayerRespawnEvent(@NotNull final Player respawnPlayer, @NotNull final Location respawnLocation, final boolean isBedSpawn) {
|
||||||
|
this(respawnPlayer, respawnLocation, isBedSpawn, false);
|
||||||
|
}
|
||||||
|
|
||||||
|
+ @Deprecated // Paper
|
||||||
|
public PlayerRespawnEvent(@NotNull final Player respawnPlayer, @NotNull final Location respawnLocation, final boolean isBedSpawn, final boolean isAnchorSpawn) {
|
||||||
|
+ // Paper start
|
||||||
|
+ this(respawnPlayer, respawnLocation, isBedSpawn, isAnchorSpawn, com.google.common.collect.ImmutableSet.builder());
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public PlayerRespawnEvent(@NotNull final Player respawnPlayer, @NotNull final Location respawnLocation, final boolean isBedSpawn, final boolean isAnchorSpawn, @NotNull final com.google.common.collect.ImmutableSet.Builder<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag> respawnFlags) {
|
||||||
|
+ // Paper end
|
||||||
|
super(respawnPlayer);
|
||||||
|
this.respawnLocation = respawnLocation;
|
||||||
|
this.isBedSpawn = isBedSpawn;
|
||||||
|
this.isAnchorSpawn = isAnchorSpawn;
|
||||||
|
+ // Paper start
|
||||||
|
+ if (this.isBedSpawn) { respawnFlags.add(RespawnFlag.BED_SPAWN); }
|
||||||
|
+ if (this.isAnchorSpawn) { respawnFlags.add(RespawnFlag.ANCHOR_SPAWN); }
|
||||||
|
+ this.respawnFlags = respawnFlags.build();
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
@@ -77,4 +90,31 @@ public class PlayerRespawnEvent extends PlayerEvent {
|
||||||
|
public static HandlerList getHandlerList() {
|
||||||
|
return handlers;
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ // Paper start
|
||||||
|
+ /**
|
||||||
|
+ * Get the set of flags that apply to this respawn.
|
||||||
|
+ *
|
||||||
|
+ * @return an immutable set of the flags that apply to this respawn
|
||||||
|
+ */
|
||||||
|
+ @NotNull
|
||||||
|
+ public java.util.Set<RespawnFlag> getRespawnFlags() {
|
||||||
|
+ return respawnFlags;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ public enum RespawnFlag {
|
||||||
|
+ /**
|
||||||
|
+ * Will use the bed spawn location
|
||||||
|
+ */
|
||||||
|
+ BED_SPAWN,
|
||||||
|
+ /**
|
||||||
|
+ * Will use the respawn anchor location
|
||||||
|
+ */
|
||||||
|
+ ANCHOR_SPAWN,
|
||||||
|
+ /**
|
||||||
|
+ * Is caused by going to the end portal in the end.
|
||||||
|
+ */
|
||||||
|
+ END_PORTAL,
|
||||||
|
+ }
|
||||||
|
+ // Paper end
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,41 @@
|
||||||
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||||
|
Date: Thu, 22 Apr 2021 17:17:47 -0700
|
||||||
|
Subject: [PATCH] add RespawnFlags to PlayerRespawnEvent
|
||||||
|
|
||||||
|
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/network/PlayerConnection.java b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||||||
|
index b543776da3b799643893984a8c6f29477ed78d4a..9455cb9bc849a330e57fdc466fb51902631e22d8 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/network/PlayerConnection.java
|
||||||
|
@@ -2436,7 +2436,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
|
||||||
|
case PERFORM_RESPAWN:
|
||||||
|
if (this.player.viewingCredits) {
|
||||||
|
this.player.viewingCredits = false;
|
||||||
|
- this.player = this.minecraftServer.getPlayerList().moveToWorld(this.player, true);
|
||||||
|
+ this.player = this.minecraftServer.getPlayerList().moveToWorld(this.player, this.minecraftServer.getWorldServer(this.player.getSpawnDimension()), true, null, true, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag.END_PORTAL); // Paper - add isEndCreditsRespawn argument
|
||||||
|
CriterionTriggers.v.a(this.player, World.THE_END, World.OVERWORLD);
|
||||||
|
} else {
|
||||||
|
if (this.player.getHealth() > 0.0F) {
|
||||||
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||||
|
index f8f0212497ad4fbb1273820a06a4ae6721053b8e..6bfa8020c19721dd63e038e4b866a7d3a24e66ac 100644
|
||||||
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||||
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
||||||
|
@@ -820,7 +820,7 @@ public abstract class PlayerList {
|
||||||
|
return this.moveToWorld(entityplayer, this.server.getWorldServer(entityplayer.getSpawnDimension()), flag, null, true);
|
||||||
|
}
|
||||||
|
|
||||||
|
- public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation) {
|
||||||
|
+ public EntityPlayer moveToWorld(EntityPlayer entityplayer, WorldServer worldserver, boolean flag, Location location, boolean avoidSuffocation, org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag...respawnFlags) { // Paper
|
||||||
|
entityplayer.stopRiding(); // CraftBukkit
|
||||||
|
this.players.remove(entityplayer);
|
||||||
|
this.playersByName.remove(entityplayer.getName().toLowerCase(java.util.Locale.ROOT)); // Spigot
|
||||||
|
@@ -920,7 +920,7 @@ public abstract class PlayerList {
|
||||||
|
}
|
||||||
|
|
||||||
|
Player respawnPlayer = cserver.getPlayer(entityplayer1);
|
||||||
|
- PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
|
||||||
|
+ PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn && !isAnchorSpawn, isAnchorSpawn, com.google.common.collect.ImmutableSet.<org.bukkit.event.player.PlayerRespawnEvent.RespawnFlag>builder().add(respawnFlags)); // Paper - Fix anchor respawn acting as a bed respawn from the end portal
|
||||||
|
cserver.getPluginManager().callEvent(respawnEvent);
|
||||||
|
// Spigot Start
|
||||||
|
if (entityplayer.playerConnection.isDisconnected()) {
|
||||||
Loading…
Reference in a new issue