mirror of
https://github.com/TotalFreedomMC/TF-PlotSquared.git
synced 2024-12-23 00:15:06 +00:00
Bugfixes for deny-teleport
This commit is contained in:
parent
05ef076ef0
commit
ae1273a7f3
2 changed files with 30 additions and 33 deletions
|
@ -679,8 +679,6 @@ import java.util.regex.Pattern;
|
|||
|
||||
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
|
||||
public void onTeleport(PlayerTeleportEvent event) {
|
||||
if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
|
||||
.equals(event.getTo().getWorld())) {
|
||||
final Object lastLoc =
|
||||
BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
|
||||
final Object lastPlot =
|
||||
|
@ -712,7 +710,6 @@ import java.util.regex.Pattern;
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
playerMove(event);
|
||||
}
|
||||
|
||||
|
|
|
@ -22,14 +22,14 @@ public class TeleportDenyFlag extends EnumFlag {
|
|||
result = !plot.getMembers().contains(player.getUUID());
|
||||
break;
|
||||
case "nonmembers":
|
||||
result = !plot.isAdded(player.getUUID());
|
||||
result = plot.isAdded(player.getUUID());
|
||||
break;
|
||||
case "nontrusted":
|
||||
result = !plot.getTrusted().contains(player.getUUID()) && !plot
|
||||
result = plot.getTrusted().contains(player.getUUID()) || plot
|
||||
.isOwner(player.getUUID());
|
||||
break;
|
||||
case "nonowners":
|
||||
result = !plot.isOwner(player.getUUID());
|
||||
result = plot.isOwner(player.getUUID());
|
||||
break;
|
||||
default:
|
||||
return true;
|
||||
|
|
Loading…
Reference in a new issue