From 52496af9a18a728c7d7208ace2c4b229bfec12e9 Mon Sep 17 00:00:00 2001
From: Jesse Boyd <jessepaleg@gmail.com>
Date: Mon, 13 Mar 2017 07:16:16 +1100
Subject: [PATCH] Fix road interact on sponge

---
 .../sponge/listener/MainListener.java         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java b/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java
index 65511156e..927c12db6 100644
--- a/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java
+++ b/Sponge/src/main/java/com/plotsquared/sponge/listener/MainListener.java
@@ -311,13 +311,13 @@ public class MainListener {
             return;
         }
         Location loc = SpongeUtil.getLocation(player.getWorld().getName(), target.get());
-        org.spongepowered.api.world.Location l = SpongeUtil.getLocation(loc);
-        Plot plot = loc.getPlot();
+        PlotArea area = loc.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getPlot(loc);
         PlotPlayer pp = SpongeUtil.getPlayer(player);
         if (plot == null) {
-            if (loc.getPlotAbs() == null) {
-                return;
-            }
             if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_INTERACT_ROAD)) {
                 event.setCancelled(true);
                 return;
@@ -336,6 +336,7 @@ public class MainListener {
             return;
         } else {
             com.google.common.base.Optional<HashSet<PlotBlock>> flag = plot.getFlag(Flags.USE);
+            org.spongepowered.api.world.Location l = SpongeUtil.getLocation(loc);
             if (flag.isPresent() && flag.get().contains(SpongeUtil.getPlotBlock(l.getBlock()))) {
                 return;
             }
@@ -511,11 +512,12 @@ public class MainListener {
         Transaction<BlockSnapshot> first = transactions.get(0);
         BlockSnapshot pos = first.getOriginal();
         Location loc = SpongeUtil.getLocation(worldName, pos.getPosition());
-        Plot plot = loc.getPlot();
+        PlotArea area = loc.getPlotArea();
+        if (area == null) {
+            return;
+        }
+        Plot plot = area.getPlot(loc);
         if (plot == null) {
-            if (loc.getPlotAbs() == null) {
-                return;
-            }
             if (!Permissions.hasPermission(pp, C.PERMISSION_ADMIN_BUILD_ROAD)) {
                 event.setCancelled(true);
                 return;