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

Add all dimension checks for methods.

Browse Source
This commit is contained in:
BONNe 2022-09-30 14:34:28 +03:00
parent 4458d16274
commit 682d835961
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/main/java/world/bentobox/bentobox/listeners/teleports/AbstractTeleportListener.java
View File

@ -19,6 +19,7 @@ import java.util.*;
import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.BentoBox;
import world.bentobox.bentobox.api.addons.GameModeAddon; import world.bentobox.bentobox.api.addons.GameModeAddon;
import world.bentobox.bentobox.database.objects.Island; import world.bentobox.bentobox.database.objects.Island;
import world.bentobox.bentobox.util.Util;
/** /**
@ -88,9 +89,11 @@ public abstract class AbstractTeleportListener
*/ */
protected boolean isMakePortals(GameModeAddon gameMode, World.Environment environment) protected boolean isMakePortals(GameModeAddon gameMode, World.Environment environment)
{ {
return environment.equals(World.Environment.NETHER) ? return switch (environment) {
gameMode.getWorldSettings().isMakeNetherPortals() : case NETHER -> gameMode.getWorldSettings().isMakeNetherPortals();
gameMode.getWorldSettings().isMakeEndPortals(); case THE_END -> gameMode.getWorldSettings().isMakeEndPortals();
default -> false;
};
} }
@ -98,14 +101,16 @@ public abstract class AbstractTeleportListener
* Check if nether or end are generated * Check if nether or end are generated
* *
* @param overWorld - game world * @param overWorld - game world
* @param env - environment * @param environment - environment
* @return true or false * @return true or false
*/ */
protected boolean isAllowedInConfig(World overWorld, World.Environment env) protected boolean isAllowedInConfig(World overWorld, World.Environment environment)
{ {
return env.equals(World.Environment.NETHER) ? return switch (environment) {
this.plugin.getIWM().isNetherGenerate(overWorld) : case NETHER -> this.plugin.getIWM().isNetherGenerate(overWorld);
this.plugin.getIWM().isEndGenerate(overWorld); case THE_END -> this.plugin.getIWM().isEndGenerate(overWorld);
default -> true;
};
} }
@ -117,7 +122,11 @@ public abstract class AbstractTeleportListener
*/ */
protected boolean isAllowedOnServer(World.Environment environment) protected boolean isAllowedOnServer(World.Environment environment)
{ {
return environment.equals(World.Environment.NETHER) ? Bukkit.getAllowNether() : Bukkit.getAllowEnd(); return switch (environment) {
case NETHER -> Bukkit.getAllowNether();
case THE_END -> Bukkit.getAllowEnd();
default -> true;
};
} }
@ -130,9 +139,11 @@ public abstract class AbstractTeleportListener
*/ */
protected boolean isIslandWorld(World overWorld, World.Environment environment) protected boolean isIslandWorld(World overWorld, World.Environment environment)
{ {
return environment.equals(World.Environment.NETHER) ? return switch (environment) {
this.plugin.getIWM().isNetherIslands(overWorld) : case NETHER -> this.plugin.getIWM().isNetherIslands(overWorld);
this.plugin.getIWM().isEndIslands(overWorld); case THE_END -> this.plugin.getIWM().isEndIslands(overWorld);
default -> true;
};
} }
@ -145,9 +156,11 @@ public abstract class AbstractTeleportListener
*/ */
protected World getNetherEndWorld(World overWorld, World.Environment environment) protected World getNetherEndWorld(World overWorld, World.Environment environment)
{ {
return environment.equals(World.Environment.NETHER) ? return switch (environment) {
this.plugin.getIWM().getNetherWorld(overWorld) : case NETHER -> this.plugin.getIWM().getNetherWorld(overWorld);
this.plugin.getIWM().getEndWorld(overWorld); case THE_END -> this.plugin.getIWM().getEndWorld(overWorld);
default -> Util.getWorld(overWorld);
};
} }
@ -160,7 +173,11 @@ public abstract class AbstractTeleportListener
*/ */
protected boolean hasPartnerIsland(Island island, World.Environment environment) protected boolean hasPartnerIsland(Island island, World.Environment environment)
{ {
return environment.equals(World.Environment.NETHER) ? island.hasNetherIsland() : island.hasEndIsland(); return switch (environment) {
case NETHER -> island.hasNetherIsland();
case THE_END -> island.hasEndIsland();
default -> true;
};
} }