From dabc551cc15636a5e0ec64a7aa1df59779416d21 Mon Sep 17 00:00:00 2001
From: boy0001 <jessepaleg@gmail.com>
Date: Tue, 31 Mar 2015 16:43:17 +1100
Subject: [PATCH] kick check

---
 .../java/com/intellectualcrafters/plot/commands/Kick.java     | 3 ++-
 .../intellectualcrafters/plot/database/PlotMeConverter.java   | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
index d539629ee..8dfd92916 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Kick.java
@@ -55,7 +55,8 @@ public class Kick extends SubCommand {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER, args[0]);
             return false;
         }
-        if (!player.getLocation().getWorld().equals(loc.getWorld()) || !plot.equals(MainUtil.getPlot(loc))) {
+        Location otherLoc = player.getLocation();
+        if (!plr.getLocation().getWorld().equals(otherLoc.getWorld()) || !plot.equals(MainUtil.getPlot(otherLoc))) {
             MainUtil.sendMessage(plr, C.INVALID_PLAYER.s().replaceAll("%player%", args[0]));
             return false;
         }
diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
index a76b2b2c6..6cde2cfe9 100644
--- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
+++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/database/PlotMeConverter.java
@@ -95,6 +95,7 @@ public class PlotMeConverter {
                     final Set<String> worlds = plotConfig.getConfigurationSection("worlds").getKeys(false);
                     stmt = connection.createStatement();
                     r = stmt.executeQuery("SELECT * FROM `plotmePlots`");
+                    // TODO check if r contains UUID collumn -> assign var
                     while (r.next()) {
                         count++;
                         final PlotId id = new PlotId(r.getInt("idX"), r.getInt("idZ"));
@@ -110,6 +111,7 @@ public class PlotMeConverter {
                             if (name.equals("*")) {
                                 owner = DBFunc.everyone;
                             } else {
+                            	// TODO check PlotMe table for UUID
                                 sendMessage("&cCould not identify owner for plot: " + id + " -> '" + name + "'");
                                 continue;
                             }
@@ -128,6 +130,7 @@ public class PlotMeConverter {
                             if (name.equals("*")) {
                                 helper = DBFunc.everyone;
                             } else {
+                            	// TODO check PlotMe table for UUID
                                 sendMessage("&6Could not identify helper for plot: " + id);
                                 continue;
                             }
@@ -147,6 +150,7 @@ public class PlotMeConverter {
                             if (name.equals("*")) {
                                 denied = DBFunc.everyone;
                             } else {
+                            	// TODO check PlotMe table for UUID
                                 sendMessage("&6Could not identify denied for plot: " + id);
                                 continue;
                             }