From eeb2e900429830d323b93c62b6d4889d4a478819 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Sat, 6 Dec 2014 01:15:36 +1100
Subject: [PATCH] Fixed helper issue

---
 PlotSquared/pom.xml                                           | 2 +-
 .../java/com/intellectualcrafters/plot/commands/Denied.java   | 4 +++-
 .../java/com/intellectualcrafters/plot/commands/Helpers.java  | 4 +++-
 .../java/com/intellectualcrafters/plot/commands/Trusted.java  | 4 +++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/PlotSquared/pom.xml b/PlotSquared/pom.xml
index 4e481e113..94edc9832 100644
--- a/PlotSquared/pom.xml
+++ b/PlotSquared/pom.xml
@@ -6,7 +6,7 @@
     <groupId>com.intellectualcrafters</groupId>
 
     <artifactId>PlotSquared</artifactId>
-    <version>2.3.5</version>
+    <version>2.3.6</version>
     <name>PlotSquared</name>
     <packaging>jar</packaging>
     <build>
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java
index b50a65ad1..af4ad84fd 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Denied.java
@@ -21,12 +21,14 @@
 
 package com.intellectualcrafters.plot.commands;
 
+import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.events.PlayerPlotDeniedEvent;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -51,7 +53,7 @@ public class Denied extends SubCommand {
             return true;
         }
         final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if ((plot.owner == null) || !plot.hasRights(plr)) {
+        if (((plot.owner == null) || !plot.getOwner().equals(plr.getUniqueId())) && !PlotMain.hasPermission(plr, "plots.admin")) {
             PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java
index aab5e8d8f..4576f413d 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Helpers.java
@@ -21,12 +21,14 @@
 
 package com.intellectualcrafters.plot.commands;
 
+import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.events.PlayerPlotHelperEvent;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -50,7 +52,7 @@ public class Helpers extends SubCommand {
             return true;
         }
         final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if ((plot.owner == null) || !plot.getOwner().equals(plr)) {
+        if (((plot.owner == null) || !plot.getOwner().equals(plr.getUniqueId())) && !PlotMain.hasPermission(plr, "plots.admin")) {
             PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java
index 02686eb0c..95dcc2b7e 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Trusted.java
@@ -21,12 +21,14 @@
 
 package com.intellectualcrafters.plot.commands;
 
+import com.intellectualcrafters.plot.PlotMain;
 import com.intellectualcrafters.plot.config.C;
 import com.intellectualcrafters.plot.database.DBFunc;
 import com.intellectualcrafters.plot.events.PlayerPlotTrustedEvent;
 import com.intellectualcrafters.plot.object.Plot;
 import com.intellectualcrafters.plot.util.PlayerFunctions;
 import com.intellectualcrafters.plot.util.UUIDHandler;
+
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
@@ -50,7 +52,7 @@ public class Trusted extends SubCommand {
             return true;
         }
         final Plot plot = PlayerFunctions.getCurrentPlot(plr);
-        if ((plot.owner == null) || !plot.getOwner().equals(plr)) {
+        if (((plot.owner == null) || !plot.getOwner().equals(plr.getUniqueId())) && !PlotMain.hasPermission(plr, "plots.admin")) {
             PlayerFunctions.sendMessage(plr, C.NO_PLOT_PERMS);
             return true;
         }