From 8ccee322c6d1d5b3e1a34987c3bd4d649d411286 Mon Sep 17 00:00:00 2001 From: boy0001 Date: Sun, 22 Feb 2015 17:14:37 +1100 Subject: [PATCH] DB --- .../plot/commands/CreateRoadSchematic.java | 3 --- .../com/intellectualcrafters/plot/commands/Database.java | 8 +++----- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java index 42ef8e481..3818d7dbe 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/CreateRoadSchematic.java @@ -22,15 +22,12 @@ package com.intellectualcrafters.plot.commands; import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.config.C; -import com.intellectualcrafters.plot.generator.BukkitHybridUtils; -import com.intellectualcrafters.plot.generator.HybridPlotManager; import com.intellectualcrafters.plot.generator.HybridPlotWorld; import com.intellectualcrafters.plot.generator.HybridUtils; import com.intellectualcrafters.plot.object.Location; import com.intellectualcrafters.plot.object.Plot; import com.intellectualcrafters.plot.object.PlotPlayer; import com.intellectualcrafters.plot.util.MainUtil; -import com.intellectualcrafters.plot.util.bukkit.BukkitPlayerFunctions; public class CreateRoadSchematic extends SubCommand { public CreateRoadSchematic() { diff --git a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java index 3ffbd9f09..5f0300bcb 100644 --- a/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java +++ b/PlotSquared/src/main/java/com/intellectualcrafters/plot/commands/Database.java @@ -7,8 +7,6 @@ import java.sql.SQLException; import java.util.ArrayList; import java.util.UUID; -import org.bukkit.entity.Player; - import com.intellectualcrafters.plot.PlotSquared; import com.intellectualcrafters.plot.database.MySQL; import com.intellectualcrafters.plot.database.SQLManager; @@ -35,7 +33,7 @@ public class Database extends SubCommand { if (uuid == null) { PlotSquared.log(msg); } else { - final Player p = UUIDHandler.uuidWrapper.getPlayer(uuid); + final PlotPlayer p = UUIDHandler.getPlayer(uuid); if ((p != null) && p.isOnline()) { return MainUtil.sendMessage(p, msg); } else { @@ -138,11 +136,11 @@ public class Database extends SubCommand { return false; } - private boolean sendMessage(final Player player, final String msg) { + private boolean sendMessage(final PlotPlayer player, final String msg) { if (player == null) { PlotSquared.log(msg); } else { - MainUtil.sendMessage(BukkitUtil.getPlayer(player), msg); + MainUtil.sendMessage(player, msg); } return true; }