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

Avoids trying to paste islands on portal if use own generator is true.

Browse Source 
This affected SkyGrid.

https://github.com/BentoBoxWorld/SkyGrid/issues/18
This commit is contained in:
tastybento 2019-07-05 22:00:09 -07:00
parent 6d7f0eaf6d
commit e9ca8733c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,7 @@ public class PortalTeleportationListener implements Listener {
Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.THE_END)).orElse(e.getFrom().toVector().toLocation(endWorld)); Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.THE_END)).orElse(e.getFrom().toVector().toLocation(endWorld));
e.setCancelled(true); e.setCancelled(true);
// Check if there is a missing end island // Check if there is a missing end island
if (plugin.getIWM().isEndGenerate(overWorld) if (!plugin.getIWM().isUseOwnGenerator(overWorld) && plugin.getIWM().isEndGenerate(overWorld)
&& plugin.getIWM().isEndIslands(overWorld) && plugin.getIWM().isEndIslands(overWorld)
&& plugin.getIWM().getEndWorld(overWorld) != null && plugin.getIWM().getEndWorld(overWorld) != null
&& !optionalIsland.map(Island::hasEndIsland).orElse(true)) { && !optionalIsland.map(Island::hasEndIsland).orElse(true)) {
@ -171,7 +171,7 @@ public class PortalTeleportationListener implements Listener {
Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.NETHER)).orElse(e.getFrom().toVector().toLocation(nether)); Location to = optionalIsland.map(i -> i.getSpawnPoint(Environment.NETHER)).orElse(e.getFrom().toVector().toLocation(nether));
e.setCancelled(true); e.setCancelled(true);
// Check if there is an island there or not // Check if there is an island there or not
if (plugin.getIWM().isNetherGenerate(overWorld) if (!plugin.getIWM().isUseOwnGenerator(overWorld) && plugin.getIWM().isNetherGenerate(overWorld)
&& plugin.getIWM().isNetherIslands(overWorld) && plugin.getIWM().isNetherIslands(overWorld)
&& plugin.getIWM().getNetherWorld(overWorld) != null && plugin.getIWM().getNetherWorld(overWorld) != null
&& !optionalIsland.map(Island::hasNetherIsland).orElse(true)) { && !optionalIsland.map(Island::hasNetherIsland).orElse(true)) {