Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-09-24 21:02:48 +02:00
Code Issues Projects Releases Wiki Activity

Fix NPE in getSafeHomeLocation (#1650) (#1651)

Browse Source
This commit is contained in:
Thomas Cordua-von Specht 2021-01-20 15:48:22 -08:00 committed by GitHub
parent 942c1ff3b3
commit 737ad16ff6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/managers/IslandsManager.java
View File

@ -627,7 +627,7 @@ public class IslandsManager {
// location // location
if (plugin.getIslands().inTeam(world, user.getUniqueId())) { if (plugin.getIslands().inTeam(world, user.getUniqueId())) {
l = plugin.getIslands().getIslandLocation(world, user.getUniqueId()); l = plugin.getIslands().getIslandLocation(world, user.getUniqueId());
if (isSafeLocation(l)) { if (l != null && isSafeLocation(l)) {
plugin.getPlayers().setHomeLocation(user, l, number); plugin.getPlayers().setHomeLocation(user, l, number);
return l; return l;
} else { } else {
@ -640,7 +640,7 @@ public class IslandsManager {
} }
} else { } else {
l = plugin.getIslands().getIslandLocation(world, user.getUniqueId()); l = plugin.getIslands().getIslandLocation(world, user.getUniqueId());
if (isSafeLocation(l)) { if (l != null && isSafeLocation(l)) {
plugin.getPlayers().setHomeLocation(user, l, number); plugin.getPlayers().setHomeLocation(user, l, number);
return l.clone().add(new Vector(0.5D,0,0.5D)); return l.clone().add(new Vector(0.5D,0,0.5D));
} }