Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/UserData.java
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,18 @@ public boolean isTeleportEnabled() {
return holder.teleportEnabled();
}

public boolean isTeleportAllowedFor(final IUser teleporter) {
if (isTeleportEnabled()) {
return true;
}
if (teleporter == null) {
return true;
}
return teleporter.isAuthorized("essentials.tptoggle.bypass")
|| teleporter.isAuthorized("essentials.tpo")
|| teleporter.isAuthorized("essentials.tpohere");
}

public void setTeleportEnabled(final boolean set) {
holder.teleportEnabled(set);
config.save();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public void run(final Server server, final User user, final String commandLabel,
case 1:
final User player = getPlayer(server, user, args, 0, false, true);

if (!player.isTeleportEnabled()) {
if (!player.isTeleportAllowedFor(user)) {
throw new TranslatableException("teleportDisabled", player.getDisplayName());
}

Expand Down Expand Up @@ -78,7 +78,7 @@ public void run(final Server server, final User user, final String commandLabel,
throw new NotEnoughArgumentsException(user.playerTl("teleportInvalidLocation"));
}
final Location locposother = new Location(target2.getWorld(), x, y, z, target2.getLocation().getYaw(), target2.getLocation().getPitch());
if (!target2.isTeleportEnabled()) {
if (!target2.isTeleportAllowedFor(user)) {
throw new TranslatableException("teleportDisabled", target2.getDisplayName());
}
user.sendTl("teleporting", locposother.getWorld().getName(), locposother.getBlockX(), locposother.getBlockY(), locposother.getBlockZ());
Expand All @@ -96,10 +96,10 @@ public void run(final Server server, final User user, final String commandLabel,
}
final User target = getPlayer(server, user, args, 0);
final User toPlayer = getPlayer(server, user, args, 1);
if (!target.isTeleportEnabled()) {
if (!target.isTeleportAllowedFor(user)) {
throw new TranslatableException("teleportDisabled", target.getDisplayName());
}
if (!toPlayer.isTeleportEnabled()) {
if (!toPlayer.isTeleportAllowedFor(user)) {
throw new TranslatableException("teleportDisabled", toPlayer.getDisplayName());
}
if (target.getWorld() != toPlayer.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + toPlayer.getWorld().getName())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public void run(final Server server, final User user, final String commandLabel,
if (!player.isAuthorized("essentials.tpaccept")) {
throw new TranslatableException("teleportNoAcceptPermission", player.getDisplayName());
}
if (!player.isTeleportEnabled()) {
if (!player.isTeleportAllowedFor(user)) {
throw new TranslatableException("teleportDisabled", player.getDisplayName());
}
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + player.getWorld().getName())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public void run(final Server server, final User user, final String commandLabel,
if (!player.isAuthorized("essentials.tpaccept")) {
throw new TranslatableException("teleportNoAcceptPermission", player.getDisplayName());
}
if (!player.isTeleportEnabled()) {
if (!player.isTeleportAllowedFor(user)) {
throw new TranslatableException("teleportDisabled", player.getDisplayName());
}
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public Commandtphere() {
@Override
public void run(final Server server, final User user, final String commandLabel, final String[] args) throws Exception {
final User player = getPlayer(server, user, args, 0);
if (!player.isTeleportEnabled()) {
if (!player.isTeleportAllowedFor(user)) {
throw new TranslatableException("teleportDisabled", player.getDisplayName());
}
if (user.getWorld() != player.getWorld() && ess.getSettings().isWorldTeleportPermissions() && !user.isAuthorized("essentials.worlds." + user.getWorld().getName())) {
Expand Down
2 changes: 2 additions & 0 deletions Essentials/src/main/resources/plugin.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1350,6 +1350,8 @@ permissions:
description: Allows access to the /tptoggle command
essentials.tptoggle.others:
description: Allows access to the /tptoggle command for other players
essentials.tptoggle.bypass:
description: Allows the bearer to bypass the tptoggle setting for other players
essentials.tpr:
description: Allows access to the /tpr command
essentials.settpr:
Expand Down