Upstream
/
bentobox
mirror of https://github.com/BentoBoxWorld/BentoBox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes bug where player will not exit SPECTATOR mode 

If the proposed location was immediately safe, the player was not being
put back to the default game mode.
This commit is contained in:
tastybento 2019-02-21 10:41:59 -08:00
parent 54811c5dbd
commit 278eb37033
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/main/java/world/bentobox/bentobox/util/teleport/SafeSpotTeleport.java
View File

@ -77,6 +77,13 @@ public class SafeSpotTeleport {
} else {
// If this is not a portal teleport, then go to the safe location immediately
entity.teleport(location);
// Exit spectator mode if in it
if (entity instanceof Player) {
Player player = (Player)entity;
if (overrideGamemode && player.getGameMode().equals(GameMode.SPECTATOR)) {
player.setGameMode(plugin.getIWM().getDefaultGameMode(player.getWorld()));
}
}
return;
}
}
@ -115,14 +122,16 @@ public class SafeSpotTeleport {
task.cancel();
// Check portal
if (portal && bestSpot != null) {
// No portals found, teleport to the best spot we found
// Portals found, teleport to the best spot we found
teleportEntity(bestSpot);
if (overrideGamemode && entity instanceof Player && ((Player)entity).getGameMode().equals(GameMode.SPECTATOR)) {
((Player)entity).setGameMode(plugin.getIWM().getDefaultGameMode(bestSpot.getWorld()));
}
} else if (entity instanceof Player && !failureMessage.isEmpty()) {
} else if (entity instanceof Player) {
// Failed, no safe spot
User.getInstance(entity).notify(failureMessage);
if (!failureMessage.isEmpty()) {
User.getInstance(entity).notify(failureMessage);
}
if (overrideGamemode && ((Player)entity).getGameMode().equals(GameMode.SPECTATOR)) {
if (plugin.getIWM().inWorld(entity.getLocation())) {
((Player)entity).setGameMode(plugin.getIWM().getDefaultGameMode(entity.getWorld()));
@ -392,7 +401,7 @@ public class SafeSpotTeleport {
}
/**
* Sets whether the player's gamemode should be overridden.
* Sets whether the player's gamemode should be overridden. Default is <tt>true</tt>
* @param overrideGamemode whether the player's gamemode should be overridden.
* @return Builder
*/