OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-06 18:50:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

#1338: Introduce getRespawnLocation as a replacement for getBedSpawnLocation

Browse source 
By: Nothixal <nothixal@gmail.com>
This commit is contained in:
CraftBukkit/Spigot 2024-01-22 20:27:09 +11:00
parent 5165e97c74
commit e6b4a5f109
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
paper-server/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
View file

@ -297,6 +297,11 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@Override @Override
public Location getBedSpawnLocation() { public Location getBedSpawnLocation() {
return getRespawnLocation();
}
@Override
public Location getRespawnLocation() {
NBTTagCompound data = getData(); NBTTagCompound data = getData();
if (data == null) return null; if (data == null) return null;

15
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file

@ -1008,6 +1008,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@Override @Override
public Location getBedSpawnLocation() { public Location getBedSpawnLocation() {
return getRespawnLocation();
}
@Override
public Location getRespawnLocation() {
WorldServer world = getHandle().server.getLevel(getHandle().getRespawnDimension()); WorldServer world = getHandle().server.getLevel(getHandle().getRespawnDimension());
BlockPosition bed = getHandle().getRespawnPosition(); BlockPosition bed = getHandle().getRespawnPosition();
@ -1026,8 +1031,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
setBedSpawnLocation(location, false); setBedSpawnLocation(location, false);
} }
@Override
public void setRespawnLocation(Location location) {
setRespawnLocation(location, false);
}
@Override @Override
public void setBedSpawnLocation(Location location, boolean override) { public void setBedSpawnLocation(Location location, boolean override) {
setRespawnLocation(location, override);
}
@Override
public void setRespawnLocation(Location location, boolean override) {
if (location == null) { if (location == null) {
getHandle().setRespawnPosition(null, null, 0.0F, override, false, PlayerSpawnChangeEvent.Cause.PLUGIN); getHandle().setRespawnPosition(null, null, 0.0F, override, false, PlayerSpawnChangeEvent.Cause.PLUGIN);
} else { } else {