From 5d50dc9971346f27230d575286870d7f9fca5837 Mon Sep 17 00:00:00 2001
From: drtshock <drtshock13@gmail.com>
Date: Mon, 19 May 2014 11:45:45 -0500
Subject: [PATCH] Add this.

---
 src/main/java/com/massivecraft/factions/FPlayer.java         | 4 +---
 src/main/java/com/massivecraft/factions/P.java               | 3 ---
 src/main/java/com/massivecraft/factions/cmd/CmdHome.java     | 5 +++++
 src/main/java/com/massivecraft/factions/cmd/FCommand.java    | 4 ++--
 .../com/massivecraft/factions/integration/Essentials.java    | 2 +-
 .../com/massivecraft/factions/zcore/util/UUIDFetcher.java    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/FPlayer.java b/src/main/java/com/massivecraft/factions/FPlayer.java
index 6c773d2e..5128b185 100644
--- a/src/main/java/com/massivecraft/factions/FPlayer.java
+++ b/src/main/java/com/massivecraft/factions/FPlayer.java
@@ -15,12 +15,10 @@ import com.massivecraft.factions.zcore.persist.PlayerEntity;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 
 import java.util.HashSet;
 import java.util.Set;
-import java.util.UUID;
 
 
 /**
@@ -302,7 +300,7 @@ public class FPlayer extends PlayerEntity implements EconomyParticipator {
     }
 
     public String getName() {
-        if(isOnline()) {
+        if (isOnline()) {
             return getPlayer().getName();
         }
         /*OfflinePlayer player = Bukkit.getOfflinePlayer(UUID.fromString(getId()));
diff --git a/src/main/java/com/massivecraft/factions/P.java b/src/main/java/com/massivecraft/factions/P.java
index f9333f02..7af83e38 100644
--- a/src/main/java/com/massivecraft/factions/P.java
+++ b/src/main/java/com/massivecraft/factions/P.java
@@ -13,9 +13,6 @@ import com.massivecraft.factions.util.MapFLocToStringSetTypeAdapter;
 import com.massivecraft.factions.util.MyLocationTypeAdapter;
 import com.massivecraft.factions.zcore.MPlugin;
 import com.massivecraft.factions.zcore.util.TextUtil;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.block.Block;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.craftbukkit.libs.com.google.gson.GsonBuilder;
diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java
index 15d5f850..b839641f 100644
--- a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java
@@ -1,6 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
+import com.massivecraft.factions.integration.Essentials;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
@@ -107,6 +108,10 @@ public class CmdHome extends FCommand {
                 return;
             }
         }
+
+        // if Essentials teleport handling is enabled and available, pass the teleport off to it (for delay and cooldown)
+        if (Essentials.handleTeleport(me, myFaction.getHome())) return;
+
         // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
         if (!payForCommand(Conf.econCostHome, "to teleport to your faction home", "for teleporting to your faction home"))
             return;
diff --git a/src/main/java/com/massivecraft/factions/cmd/FCommand.java b/src/main/java/com/massivecraft/factions/cmd/FCommand.java
index fb0d1762..d79f7d65 100644
--- a/src/main/java/com/massivecraft/factions/cmd/FCommand.java
+++ b/src/main/java/com/massivecraft/factions/cmd/FCommand.java
@@ -132,7 +132,7 @@ public abstract class FCommand extends MCommand<P> {
 
         if (name != null) {
             OfflinePlayer player = Bukkit.getOfflinePlayer(name);
-              if (player.hasPlayedBefore()) {
+            if (player.hasPlayedBefore()) {
                 FPlayer fplayer = FPlayers.i.get(player);
                 if (fplayer != null) {
                     ret = fplayer;
@@ -196,7 +196,7 @@ public abstract class FCommand extends MCommand<P> {
             // Next we match player names
             if (faction == null) {
                 OfflinePlayer player = Bukkit.getOfflinePlayer(name);
-                  if (player.hasPlayedBefore()) {
+                if (player.hasPlayedBefore()) {
                     FPlayer fplayer = FPlayers.i.get(player);
                     if (fplayer != null) {
                         faction = fplayer.getFaction();
diff --git a/src/main/java/com/massivecraft/factions/integration/Essentials.java b/src/main/java/com/massivecraft/factions/integration/Essentials.java
index 5de1eb52..b423d243 100644
--- a/src/main/java/com/massivecraft/factions/integration/Essentials.java
+++ b/src/main/java/com/massivecraft/factions/integration/Essentials.java
@@ -16,7 +16,7 @@ public class Essentials {
 
     public static void setup() {
         Plugin ess = Bukkit.getPluginManager().getPlugin("Essentials");
-        if(ess != null) {
+        if (ess != null) {
             essentials = (IEssentials) ess;
         }
     }
diff --git a/src/main/java/com/massivecraft/factions/zcore/util/UUIDFetcher.java b/src/main/java/com/massivecraft/factions/zcore/util/UUIDFetcher.java
index 0a123e94..e41da56c 100644
--- a/src/main/java/com/massivecraft/factions/zcore/util/UUIDFetcher.java
+++ b/src/main/java/com/massivecraft/factions/zcore/util/UUIDFetcher.java
@@ -74,7 +74,7 @@ public class UUIDFetcher implements Callable<Map<String, UUID>> {
     }
 
     private static UUID getUUID(String id) {
-        return UUID.fromString(id.substring(0, 8) + "-" + id.substring(8, 12) + "-" + id.substring(12, 16) + "-" + id.substring(16, 20) + "-" +id.substring(20, 32));
+        return UUID.fromString(id.substring(0, 8) + "-" + id.substring(8, 12) + "-" + id.substring(12, 16) + "-" + id.substring(16, 20) + "-" + id.substring(20, 32));
     }
 
     public static byte[] toBytes(UUID uuid) {