SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Bleeding] Fix NPE with a null bedSpawnLocation. Fixes BUKKIT-1500

Browse Source 
By: EdGruberman <ed@rjump.com>
This commit is contained in:
CraftBukkit/Spigot
2012-12-09 17:37:37 -06:00
parent 7aea414399
commit 3f11c5df16
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
View File

@@ -614,8 +614,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
} }
public void setBedSpawnLocation(Location location, boolean override) { public void setBedSpawnLocation(Location location, boolean override) {
getHandle().setRespawnPosition(new ChunkCoordinates(location.getBlockX(), location.getBlockY(), location.getBlockZ()), override); if (location == null) {
getHandle().spawnWorld = location.getWorld().getName(); getHandle().setRespawnPosition(null, override);
} else {
getHandle().setRespawnPosition(new ChunkCoordinates(location.getBlockX(), location.getBlockY(), location.getBlockZ()), override);
getHandle().spawnWorld = location.getWorld().getName();
}
} }
public void hidePlayer(Player player) { public void hidePlayer(Player player) {