Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-12-26 17:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2506 from mindw0rm/DenyTeleportBugfix

Browse Source 
Bugfixes for deny-teleport
This commit is contained in:
Matt 2019-10-23 14:37:20 -04:00 committed by GitHub
commit 32654e1f25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
View File

@ -679,8 +679,6 @@ import java.util.regex.Pattern;
@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
public void onTeleport(PlayerTeleportEvent event) { public void onTeleport(PlayerTeleportEvent event) {
if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
.equals(event.getTo().getWorld())) {
final Object lastLoc = final Object lastLoc =
BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION); BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
final Object lastPlot = final Object lastPlot =
@ -712,7 +710,6 @@ import java.util.regex.Pattern;
} }
} }
} }
}
playerMove(event); playerMove(event);
} }

6
Core/src/main/java/com/github/intellectualsites/plotsquared/plot/flag/TeleportDenyFlag.java
View File

@ -22,14 +22,14 @@ public class TeleportDenyFlag extends EnumFlag {
result = !plot.getMembers().contains(player.getUUID()); result = !plot.getMembers().contains(player.getUUID());
break; break;
case "nonmembers": case "nonmembers":
result = !plot.isAdded(player.getUUID()); result = plot.isAdded(player.getUUID());
break; break;
case "nontrusted": case "nontrusted":
result = !plot.getTrusted().contains(player.getUUID()) && !plot result = plot.getTrusted().contains(player.getUUID()) || plot
.isOwner(player.getUUID()); .isOwner(player.getUUID());
break; break;
case "nonowners": case "nonowners":
result = !plot.isOwner(player.getUUID()); result = plot.isOwner(player.getUUID());
break; break;
default: default:
return true; return true;