EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-29 08:36:45 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'breaking' into UntrustedVisit

Browse Source
This commit is contained in:
mindw0rm 2019-10-23 20:51:59 +02:00 committed by GitHub
commit cb1767347b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 34 additions and 37 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)
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 =
@ -716,7 +714,6 @@ import java.util.regex.Pattern;
}
}
}
}
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());
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;