OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-02 13:07:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix contract with Player.getBedSpawnLocation. Fixes BUKKIT-3525

Browse source 
Getting the bed spawn location is supposed to check if the bed is
valid, however, it currently did not do so.
This commit is contained in:
feildmaster 2013-01-29 10:03:05 -06:00
parent 0576395ddd
commit 37975946a2
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View file

@ -608,8 +608,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
public Location getBedSpawnLocation() { public Location getBedSpawnLocation() {
World world = getServer().getWorld(getHandle().spawnWorld); World world = getServer().getWorld(getHandle().spawnWorld);
if ((world != null) && (getHandle().getBed() != null)) { ChunkCoordinates bed = getHandle().getBed();
return new Location(world, getHandle().getBed().x, getHandle().getBed().y, getHandle().getBed().z);
if (world != null) {
bed = EntityHuman.getBed(((CraftWorld) world).getHandle(), bed, getHandle().isRespawnForced());
if (bed != null) {
return new Location(world, bed.x, bed.y, bed.z);
}
} }
return null; return null;
} }