geforkt von Mirrors/Paper
66 Zeilen
3.5 KiB
Diff
66 Zeilen
3.5 KiB
Diff
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] Add PlayerPostRespawnEvent
|
|
|
|
|
|
diff --git a/src/main/java/net/minecraft/server/players/PlayerList.java b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
index 79203d0e5cdb86d9e2fb22cdaeb8cf3a93e43dcc..8cd80ea83ddcfd5052c8d8c19d3edb42538d1e15 100644
|
|
--- a/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
+++ b/src/main/java/net/minecraft/server/players/PlayerList.java
|
|
@@ -738,6 +738,10 @@ public abstract class PlayerList {
|
|
|
|
entityplayer1.addTag(s);
|
|
}
|
|
+ // Paper start - Add PlayerPostRespawnEvent
|
|
+ boolean isBedSpawn = false;
|
|
+ boolean isRespawn = false;
|
|
+ // Paper end - Add PlayerPostRespawnEvent
|
|
|
|
// CraftBukkit start - fire PlayerRespawnEvent
|
|
DimensionTransition dimensiontransition;
|
|
@@ -745,11 +749,16 @@ public abstract class PlayerList {
|
|
dimensiontransition = entityplayer.findRespawnPositionAndUseSpawnBlock(flag, DimensionTransition.DO_NOTHING, reason);
|
|
|
|
if (!flag) entityplayer.reset(); // SPIGOT-4785
|
|
+ // Paper start - Add PlayerPostRespawnEvent
|
|
+ if (dimensiontransition == null) return entityplayer; // Early exit, mirrors belows early return for disconnected players in respawn event
|
|
+ isRespawn = true;
|
|
+ location = CraftLocation.toBukkit(dimensiontransition.pos(), dimensiontransition.newLevel().getWorld(), dimensiontransition.yRot(), dimensiontransition.xRot());
|
|
+ // Paper end - Add PlayerPostRespawnEvent
|
|
} else {
|
|
dimensiontransition = new DimensionTransition(((CraftWorld) location.getWorld()).getHandle(), CraftLocation.toVec3D(location), Vec3.ZERO, location.getYaw(), location.getPitch(), DimensionTransition.DO_NOTHING);
|
|
}
|
|
// Spigot Start
|
|
- if (dimensiontransition == null) {
|
|
+ if (dimensiontransition == null) { // Paper - Add PlayerPostRespawnEvent - diff on change - spigot early returns if respawn pos is null, that is how they handle disconnected player in respawn event
|
|
return entityplayer;
|
|
}
|
|
// Spigot End
|
|
@@ -795,6 +804,11 @@ public abstract class PlayerList {
|
|
if (iblockdata.is(Blocks.RESPAWN_ANCHOR)) {
|
|
entityplayer1.connection.send(new ClientboundSoundPacket(SoundEvents.RESPAWN_ANCHOR_DEPLETE, SoundSource.BLOCKS, (double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ(), 1.0F, 1.0F, worldserver.getRandom().nextLong()));
|
|
}
|
|
+ // Paper start - Add PlayerPostRespawnEvent
|
|
+ if (iblockdata.is(net.minecraft.tags.BlockTags.BEDS) && !dimensiontransition.missingRespawnBlock()) {
|
|
+ isBedSpawn = true;
|
|
+ }
|
|
+ // Paper end - Add PlayerPostRespawnEvent
|
|
}
|
|
// Added from changeDimension
|
|
this.sendAllPlayerInfo(entityplayer); // Update health, etc...
|
|
@@ -816,6 +830,13 @@ public abstract class PlayerList {
|
|
if (entityplayer.connection.isDisconnected()) {
|
|
this.save(entityplayer);
|
|
}
|
|
+
|
|
+ // Paper start - Add PlayerPostRespawnEvent
|
|
+ if (isRespawn) {
|
|
+ cserver.getPluginManager().callEvent(new com.destroystokyo.paper.event.player.PlayerPostRespawnEvent(entityplayer.getBukkitEntity(), location, isBedSpawn));
|
|
+ }
|
|
+ // Paper end - Add PlayerPostRespawnEvent
|
|
+
|
|
// CraftBukkit end
|
|
|
|
return entityplayer1;
|