Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-01-03 23:17:41 +01:00
Code Issues Projects Releases Wiki Activity

Fix for NPE on safe teleport when location cannot be found.

Browse Source
This commit is contained in:
tastybento 2018-06-24 18:23:57 -07:00
parent eb855edfeb
commit ae1eeec7cf
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/us/tastybento/bskyblock/util/teleport/SafeSpotTeleport.java
View File

@ -105,13 +105,22 @@ public class SafeSpotTeleport {
if (portal && bestSpot != null) { if (portal && bestSpot != null) {
// No portals found, teleport to the best spot we found // No portals found, teleport to the best spot we found
teleportEntity(bestSpot); teleportEntity(bestSpot);
} else if (entity instanceof Player && !failureMessage.isEmpty()) {
// Failed, no safe spot
entity.sendMessage(failureMessage);
}
if (entity instanceof Player && ((Player)entity).getGameMode().equals(GameMode.SPECTATOR)) { if (entity instanceof Player && ((Player)entity).getGameMode().equals(GameMode.SPECTATOR)) {
((Player)entity).setGameMode(plugin.getIWM().getDefaultGameMode(bestSpot.getWorld())); ((Player)entity).setGameMode(plugin.getIWM().getDefaultGameMode(bestSpot.getWorld()));
} }
} else if (entity instanceof Player && !failureMessage.isEmpty()) {
// Failed, no safe spot
entity.sendMessage(failureMessage);
if (entity instanceof Player && ((Player)entity).getGameMode().equals(GameMode.SPECTATOR)) {
if (plugin.getIWM().inWorld(entity.getLocation())) {
((Player)entity).setGameMode(plugin.getIWM().getDefaultGameMode(entity.getWorld()));
} else {
// Last resort
((Player)entity).setGameMode(GameMode.SURVIVAL);
}
}
}
} }
/** /**