Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-12-26 19:17:40 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' of https://github.com/BentoBoxWorld/bentobox.git into develop

Browse Source
This commit is contained in:
tastybento 2019-02-10 20:06:22 -08:00
commit 583311ce03
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,7 +52,7 @@ public class SafeSpotTeleport {
* @param plugin - plugin object
* @param entity - entity to teleport
* @param location - the location
* @param failureMessage - already translated failure message
* @param failureMessage - locale key for the failure message
* @param portal - true if this is a portal teleport
* @param homeNumber - home number to go to
*/
@ -122,7 +122,7 @@ public class SafeSpotTeleport {
}
} else if (entity instanceof Player && !failureMessage.isEmpty()) {
// Failed, no safe spot
entity.sendMessage(failureMessage);
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()));
@ -416,7 +416,7 @@ public class SafeSpotTeleport {
return null;
}
if (failureMessage.isEmpty() && entity instanceof Player) {
failureMessage = User.getInstance(entity).getTranslation("general.errors.warp-not-safe");
failureMessage = "general.errors.warp-not-safe";
}
return new SafeSpotTeleport(plugin, entity, location, failureMessage, portal, homeNumber, overrideGamemode);
}