From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: MisterVector <whizkid3000@hotmail.com> Date: Fri, 26 Oct 2018 21:31:00 -0700 Subject: [PATCH] Implement PlayerPostRespawnEvent diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java index 47aa69dfe43390b811c264adc0af1d01bcd5ce4d..ec4e84f6275f8b305fb5a64f9c0cff24729d73ec 100644 --- a/src/main/java/net/minecraft/server/players/PlayerList.java +++ b/src/main/java/net/minecraft/server/players/PlayerList.java @@ -741,9 +741,14 @@ public abstract class PlayerList { // this.a(entityplayer1, entityplayer, worldserver1); // CraftBukkit - removed boolean flag2 = false; + // Paper start + boolean isBedSpawn = false; + boolean isRespawn = false; + // Paper end + // CraftBukkit start - fire PlayerRespawnEvent if (location == null) { - boolean isBedSpawn = false; + // boolean isBedSpawn = false; // Paper - moved up WorldServer worldserver1 = this.server.getWorldServer(entityplayer.getSpawnDimension()); if (worldserver1 != null) { Optional optional; @@ -794,6 +799,7 @@ public abstract class PlayerList { location = respawnEvent.getRespawnLocation(); if (!flag) entityplayer.reset(); // SPIGOT-4785 + isRespawn = true; // Paper } else { location.setWorld(worldserver.getWorld()); } @@ -851,6 +857,13 @@ public abstract class PlayerList { if (entityplayer.playerConnection.isDisconnected()) { this.savePlayerFile(entityplayer); } + + // Paper start + if (isRespawn) { + cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerPostRespawnEvent(entityplayer.getBukkitEntity(), location, isBedSpawn)); + } + // Paper end + // CraftBukkit end return entityplayer1; }