Upstream/FabledSkyBlock
1
0
Fork 0
mirror of https://github.com/songoda/FabledSkyBlock.git synced 2024-11-27 12:45:25 +01:00
Code Issues Projects Releases Wiki Activity

Fixed teleportation bug.

Browse Source
This commit is contained in:
Wertík 2020-03-31 22:54:21 +02:00 committed by Brianna
parent 2c86e6e89b
commit eb5e7f3399
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/songoda/skyblock/listeners/Teleport.java
View File

@ -74,7 +74,7 @@ public class Teleport implements Listener {
event.setCancelled(true);
messageManager.sendMessage(player, configLoad.getString("Island.Settings.Permission.Message"));
soundManager.playSound(player, CompatibleSound.ENTITY_VILLAGER_NO.getSound(), 1.0F, 1.0F);
soundManager.playSound(player, CompatibleSound.ENTITY_VILLAGER_NO.getSound(), 1.0F, 1.0F);
return;
}
@ -176,20 +176,22 @@ public class Teleport implements Listener {
}
}
}
@EventHandler
public void onEntityTeleport(EntityPortalEvent e) {
WorldManager worldManager = skyblock.getWorldManager();
// Do not handle player
if (e.getEntityType() == EntityType.PLAYER)
return;
Location from = e.getFrom();
Location to = e.getTo();
// Test which world the event is from
if (from.getWorld() == to.getWorld())
return;
if (worldManager.getIslandWorld(e.getFrom().getWorld()) != null)
e.setCancelled(true);
}
@EventHandler
public void onEntityTeleport(EntityPortalEvent e) {
WorldManager worldManager = skyblock.getWorldManager();
// Do not handle player
if (e.getEntityType() == EntityType.PLAYER)
return;
Location from = e.getFrom();
Location to = e.getTo();
if (to == null || from.getWorld() == to.getWorld())
return;
if (worldManager.getIslandWorld(e.getFrom().getWorld()) != null)
e.setCancelled(true);
}
}