From 8733dc6daba3175a28fcac57c6799caa54b7aa7b Mon Sep 17 00:00:00 2001
From: Sauilitired <sauilitired@gmail.com>
Date: Tue, 22 Jan 2019 10:43:29 +0100
Subject: [PATCH] Fix deny-teleport flag: Fixes #2128

---
 .../bukkit/listeners/PlayerEvents.java         | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
index 8e4ea13a0..6b172f49e 100644
--- a/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
+++ b/Bukkit/src/main/java/com/github/intellectualsites/plotsquared/bukkit/listeners/PlayerEvents.java
@@ -619,8 +619,8 @@ import java.util.regex.Pattern;
     public void onTeleport(PlayerTeleportEvent event) {
         if (event.getTo() == null || event.getFrom() == null || !event.getFrom().getWorld()
             .equals(event.getTo().getWorld())) {
-            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
-            BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LAST_PLOT);
+            final Object lastLoc = BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LOCATION);
+            final Object lastPlot = BukkitUtil.getPlayer(event.getPlayer()).deleteMeta(PlotPlayer.META_LAST_PLOT);
             org.bukkit.Location to = event.getTo();
             if (to != null) {
                 Player player = event.getPlayer();
@@ -632,7 +632,19 @@ import java.util.regex.Pattern;
                 }
                 Plot plot = area.getPlot(loc);
                 if (plot != null) {
-                    plotEntry(pp, plot);
+                    final boolean result = Flags.DENY_TELEPORT.allowsTeleport(pp, plot);
+                    if (!result) {
+                        MainUtil.sendMessage(pp, C.NO_PERMISSION_EVENT, C.PERMISSION_ADMIN_ENTRY_DENIED);
+                        event.setCancelled(true);
+                        if (lastLoc != null) {
+                            pp.setMeta(PlotPlayer.META_LOCATION, lastLoc);
+                        }
+                        if (lastPlot != null) {
+                            pp.setMeta(PlotPlayer.META_LAST_PLOT, lastPlot);
+                        }
+                    } else {
+                        plotEntry(pp, plot);
+                    }
                 }
             }
             return;