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

Fixes teleporting back from standard nether to island.

Browse Source
This commit is contained in:
tastybento 2018-11-10 11:57:46 -08:00
parent 37aa2e06f9
commit c438f4a45d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/world/bentobox/bentobox/listeners/NetherPortals.java
View File

@ -175,7 +175,7 @@ public class NetherPortals implements Listener {
public void onNetherPortalStandardNether(PlayerPortalEvent e) { public void onNetherPortalStandardNether(PlayerPortalEvent e) {
World fromWorld = e.getFrom().getWorld(); World fromWorld = e.getFrom().getWorld();
if (e.getCause().equals(TeleportCause.NETHER_PORTAL) if (e.getCause().equals(TeleportCause.NETHER_PORTAL)
&& plugin.getIWM().inWorld(e.getFrom()) && plugin.getIWM().inWorld(Util.getWorld(fromWorld))
&& !plugin.getIWM().isNetherIslands(fromWorld) && !plugin.getIWM().isNetherIslands(fromWorld)
&& fromWorld.getEnvironment().equals(Environment.NETHER) && fromWorld.getEnvironment().equals(Environment.NETHER)
&& plugin.getPlayers().isKnown(e.getPlayer().getUniqueId())) { && plugin.getPlayers().isKnown(e.getPlayer().getUniqueId())) {

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

@ -65,11 +65,11 @@ public class IslandWorldManager {
} }
/** /**
* Checks if a location is in any of the island worlds * Checks if a location is in any of the island worlds.
* This will be false if the player is in the standard Nether or standard End.
* *
* @param loc * @param loc - location
* - location * @return true if in a world or false if not. False if in standard Nether or standard End.
* @return true if in a world or false if not
*/ */
public boolean inWorld(Location loc) { public boolean inWorld(Location loc) {
return inWorld(loc.getWorld()); return inWorld(loc.getWorld());