diff --git a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java index 3477847..8ee954e 100644 --- a/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/PlayerEventListener.java @@ -173,7 +173,7 @@ public class PlayerEventListener implements Listener { } //Make sure to check if the player has any leashed creatures, even though leashed teleportation is disabled - return Teleporter.noLeashedCreaturesPreventTeleportation(player, entrancePortal.getOptions().isSilent()); + return Teleporter.noLeashedCreaturesPreventTeleportation(player); } /** diff --git a/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java b/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java index 1adc928..0b263a2 100644 --- a/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java +++ b/src/main/java/net/knarcraft/stargate/listener/VehicleEventListener.java @@ -174,7 +174,7 @@ public class VehicleEventListener implements Listener { return false; } - return Teleporter.noLeashedCreaturesPreventTeleportation(player, entrancePortal.getOptions().isSilent()); + return Teleporter.noLeashedCreaturesPreventTeleportation(player); } } diff --git a/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java b/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java index 314a100..72e2c26 100644 --- a/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java +++ b/src/main/java/net/knarcraft/stargate/portal/teleporter/Teleporter.java @@ -254,23 +254,18 @@ public abstract class Teleporter { * Checks whether a player has leashed creatures that block the teleportation * * @param player

The player trying to teleport

- * @param silent

Whether the entrance portal is silent

* @return

False if the player has leashed any creatures that cannot go through the portal

*/ - public static boolean noLeashedCreaturesPreventTeleportation(Player player, boolean silent) { + public static boolean noLeashedCreaturesPreventTeleportation(Player player) { + //If it's enabled, there is no problem + if (Stargate.getGateConfig().handleLeashedCreatures()) { + return true; + } + //Find any nearby leashed entities to teleport with the player List nearbyEntities = getLeashedCreatures(player); - //If this feature is disabled, just return - if (!Stargate.getGateConfig().handleLeashedCreatures()) { - boolean isAllowed = nearbyEntities.isEmpty(); - if (!isAllowed && !silent) { - Stargate.getMessageSender().sendErrorMessage(player, "Leashed teleportation is disabled"); - } - return isAllowed; - } else { - return true; - } + return nearbyEntities.isEmpty(); } /**