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

Added a setting to be able to disable auto nether/end island pasting

Browse Source 
https://github.com/BentoBoxWorld/BentoBox/issues/1063

Note that corresponding settings must be added to game mode addons.
Also, note that I added this as a default method so that it will not
break current older game mode addons.
This commit is contained in:
tastybento 2019-12-15 16:03:43 -08:00
parent 81b4fe5bf0
commit e8810d41d9
3 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/world/bentobox/bentobox/api/configuration/WorldSettings.java
View File

@ -136,7 +136,7 @@ public interface WorldSettings extends ConfigObject {
* @return the visitorBannedCommands
*/
List<String> getVisitorBannedCommands();
/**
* Optional list of commands that are banned when falling. Not applicable to all game modes so defaults to empty.
* @return the fallingBannedCommands
@ -413,4 +413,14 @@ public interface WorldSettings extends ConfigObject {
* @since 1.9.0
*/
boolean isCreateIslandOnFirstLoginAbortOnLogout();
/**
* Check if nether or end islands should be pasted on teleporting
* @return true if missing nether or end islands should be pasted
* @since 1.10.0
*/
default boolean isPasteMissingIslands() {
// Note that glitches can enable bedrock to be removed in ways that will not generate events.
return true;
}
}

15
src/main/java/world/bentobox/bentobox/listeners/PortalTeleportationListener.java
View File

@ -60,12 +60,12 @@ public class PortalTeleportationListener implements Listener {
}
World fromWorld = e.getFrom().getWorld();
World overWorld = Util.getWorld(fromWorld);
if (fromWorld == null || !plugin.getIWM().inWorld(overWorld)) {
// Do nothing special
return false;
}
// 1.14.4 requires explicit cancellation to prevent teleporting to the normal nether
if (!plugin.getIWM().isEndGenerate(overWorld)) {
e.setCancelled(true);
@ -110,7 +110,9 @@ public class PortalTeleportationListener implements Listener {
Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.THE_END)).orElse(e.getFrom().toVector().toLocation(endWorld));
e.setCancelled(true);
// Check if there is a missing end island
if (!plugin.getIWM().isUseOwnGenerator(overWorld) && plugin.getIWM().isEndGenerate(overWorld)
if (plugin.getIWM().pasteMissingIslands(overWorld)
&& !plugin.getIWM().isUseOwnGenerator(overWorld)
&& plugin.getIWM().isEndGenerate(overWorld)
&& plugin.getIWM().isEndIslands(overWorld)
&& plugin.getIWM().getEndWorld(overWorld) != null
&& !optionalIsland.map(Island::hasEndIsland).orElse(true)) {
@ -143,13 +145,13 @@ public class PortalTeleportationListener implements Listener {
// Do nothing special
return false;
}
// 1.14.4 requires explicit cancellation to prevent teleporting to the normal nether
if (!plugin.getIWM().isNetherGenerate(overWorld)) {
e.setCancelled(true);
return false;
}
// STANDARD NETHER
if (!plugin.getIWM().isNetherIslands(overWorld)) {
if (fromWorld.getEnvironment() != Environment.NETHER) {
@ -185,7 +187,8 @@ public class PortalTeleportationListener implements Listener {
Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.NETHER)).orElse(e.getFrom().toVector().toLocation(nether));
e.setCancelled(true);
// Check if there is an island there or not
if (!plugin.getIWM().isUseOwnGenerator(overWorld) && plugin.getIWM().isNetherGenerate(overWorld)
if (plugin.getIWM().pasteMissingIslands(overWorld) &&
!plugin.getIWM().isUseOwnGenerator(overWorld) && plugin.getIWM().isNetherGenerate(overWorld)
&& plugin.getIWM().isNetherIslands(overWorld)
&& plugin.getIWM().getNetherWorld(overWorld) != null
&& !optionalIsland.map(Island::hasNetherIsland).orElse(true)) {

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

@ -828,4 +828,14 @@ public class IslandWorldManager {
public boolean isCreateIslandOnFirstLoginAbortOnLogout(@NonNull World world) {
return gameModes.containsKey(world) && gameModes.get(world).getWorldSettings().isCreateIslandOnFirstLoginAbortOnLogout();
}
/**
* Check if nether or end islands should be pasted on teleporting
* @param world - over world
* @return true if missing nether or end islands should be pasted
* @since 1.10.0
*/
public boolean pasteMissingIslands(@NonNull World world) {
return gameModes.containsKey(world) && gameModes.get(world).getWorldSettings().isPasteMissingIslands();
}
}