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

Added WorldSetting#isTeleportPlayerToIslandUponIslandCreation()

Browse Source 
Implements https://github.com/BentoBoxWorld/BentoBox/issues/1032
This commit is contained in:
Florian CUNY 2019-12-23 15:01:32 +01:00
parent 898118cfd9
commit 48f898aa2c
4 changed files with 45 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/api/configuration/WorldSettings.java
View File

@ -423,4 +423,21 @@ public interface WorldSettings extends ConfigObject {
// Note that glitches can enable bedrock to be removed in ways that will not generate events.
return true;
}
/**
* Toggles whether the player should be teleported on his island after it got created.
* <br/>
* If set to {@code true}, the player will be teleported right away.
* <br/>
* If set to {@code false}, the player will remain where he is and a message will be sent inviting him to teleport to his island.
* <br/><br/>
* This does not apply to any other occurrences such as island reset, or island join.
* <br/><br/>
* Default value: {@code true} (to retain backward compatibility).
* @return {@code true} if the player should be teleported to his island, {@code false} otherwise.
* @since 1.10.0
*/
default boolean isTeleportPlayerToIslandUponIslandCreation() {
return true;
}
}

18
src/main/java/world/bentobox/bentobox/managers/IslandWorldManager.java
View File

@ -838,4 +838,22 @@ public class IslandWorldManager {
public boolean isPasteMissingIslands(@NonNull World world) {
return gameModes.containsKey(world) && gameModes.get(world).getWorldSettings().isPasteMissingIslands();
}
/**
* Toggles whether the player should be teleported on his island after it got created.
* <br/>
* If set to {@code true}, the player will be teleported right away.
* <br/>
* If set to {@code false}, the player will remain where he is and a message will be sent inviting him to teleport to his island.
* <br/><br/>
* This does not apply to any other occurrences such as island reset, or island join.
* <br/><br/>
* Default value: {@code true} (to retain backward compatibility).
* @param world world, not null.
* @return {@code true} if the player should be teleported to his island, {@code false} otherwise.
* @since 1.10.0
*/
public boolean isTeleportPlayerToIslandUponIslandCreation(@NonNull World world) {
return gameModes.containsKey(world) && gameModes.get(world).getWorldSettings().isTeleportPlayerToIslandUponIslandCreation();
}
}

13
src/main/java/world/bentobox/bentobox/managers/island/NewIsland.java
View File

@ -238,11 +238,16 @@ public class NewIsland {
}
// Stop the player from falling or moving if they are
if (user.isOnline()) {
user.getPlayer().setVelocity(new Vector(0,0,0));
user.getPlayer().setFallDistance(0F);
if (reason.equals(Reason.RESET) || (reason.equals(Reason.CREATE) && plugin.getIWM().isTeleportPlayerToIslandUponIslandCreation(world))) {
user.getPlayer().setVelocity(new Vector(0, 0, 0));
user.getPlayer().setFallDistance(0F);
// Teleport player after this island is built
plugin.getIslands().homeTeleport(world, user.getPlayer(), true);
// Teleport player after this island is built
plugin.getIslands().homeTeleport(world, user.getPlayer(), true);
} else {
// let's send him a message so that he knows he can teleport to his island!
user.sendMessage("commands.island.create.you-can-teleport-to-your-island");
}
} else {
// Remove the player again to completely clear the data
User.removePlayer(user.getPlayer());

1
src/main/resources/locales/en-US.yml
View File

@ -449,6 +449,7 @@ commands:
pick: "&2 Pick an island"
unknown-blueprint: "&c That blueprint has not been loaded yet."
on-first-login: "&a Welcome! We will start preparing your island in a few seconds."
you-can-teleport-to-your-island: "&a You can teleport to your island when you please."
info:
description: "display info about your island or the player's island"
parameters: "<player>"