Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-16 21:10:17 +01:00
Implements isBedSpawn() to the PlayerRespawnEvent.
Dieser Commit ist enthalten in:
Ursprung
138c70183d
Commit
0648302078
@ -217,10 +217,12 @@ public class ServerConfigurationManager {
|
|||||||
EntityPlayer entityplayer1 = entityplayer;
|
EntityPlayer entityplayer1 = entityplayer;
|
||||||
|
|
||||||
if (location == null) {
|
if (location == null) {
|
||||||
|
boolean isBedSpawn = false;
|
||||||
CraftWorld cw = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
|
CraftWorld cw = (CraftWorld) this.server.server.getWorld(entityplayer.spawnWorld);
|
||||||
if (cw != null && chunkcoordinates != null) {
|
if (cw != null && chunkcoordinates != null) {
|
||||||
ChunkCoordinates chunkcoordinates1 = EntityHuman.getBed(cw.getHandle(), chunkcoordinates);
|
ChunkCoordinates chunkcoordinates1 = EntityHuman.getBed(cw.getHandle(), chunkcoordinates);
|
||||||
if (chunkcoordinates1 != null) {
|
if (chunkcoordinates1 != null) {
|
||||||
|
isBedSpawn = true;
|
||||||
location = new Location(cw, chunkcoordinates1.x + 0.5, chunkcoordinates1.y, chunkcoordinates1.z + 0.5);
|
location = new Location(cw, chunkcoordinates1.x + 0.5, chunkcoordinates1.y, chunkcoordinates1.z + 0.5);
|
||||||
} else {
|
} else {
|
||||||
entityplayer1.netServerHandler.sendPacket(new Packet70Bed(0));
|
entityplayer1.netServerHandler.sendPacket(new Packet70Bed(0));
|
||||||
@ -234,7 +236,7 @@ public class ServerConfigurationManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
Player respawnPlayer = cserver.getPlayer(entityplayer);
|
Player respawnPlayer = cserver.getPlayer(entityplayer);
|
||||||
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location);
|
PlayerRespawnEvent respawnEvent = new PlayerRespawnEvent(respawnPlayer, location, isBedSpawn);
|
||||||
cserver.getPluginManager().callEvent(respawnEvent);
|
cserver.getPluginManager().callEvent(respawnEvent);
|
||||||
|
|
||||||
location = respawnEvent.getRespawnLocation();
|
location = respawnEvent.getRespawnLocation();
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren