From b9bd0461057bad8623fcb7f40f97f99a8e57dfb8 Mon Sep 17 00:00:00 2001
From: Steven Lawson <steven@smlawson.com>
Date: Thu, 11 Jul 2013 20:35:09 -0400
Subject: [PATCH] Changed WorldEdit API access method.

---
 appinfo.properties                            |  6 +-
 buildnumber.properties                        |  4 +-
 .../TotalFreedomMod/TFM_WorldEditBridge.java  | 98 +++++++++----------
 3 files changed, 49 insertions(+), 59 deletions(-)

diff --git a/appinfo.properties b/appinfo.properties
index 9a06d039..f444ea55 100644
--- a/appinfo.properties
+++ b/appinfo.properties
@@ -1,5 +1,5 @@
-#Wed, 10 Jul 2013 21:43:33 -0400
+#Thu, 11 Jul 2013 20:20:19 -0400
 
 program.VERSION=2.21
-program.BUILDNUM=300
-program.BUILDDATE=07/10/2013 09\:43 PM
+program.BUILDNUM=301
+program.BUILDDATE=07/11/2013 08\:20 PM
diff --git a/buildnumber.properties b/buildnumber.properties
index 3291c3a3..a6b191af 100644
--- a/buildnumber.properties
+++ b/buildnumber.properties
@@ -1,3 +1,3 @@
 #Build Number for ANT. Do not edit!
-#Wed Jul 10 21:43:33 EDT 2013
-build.number=301
+#Thu Jul 11 20:20:19 EDT 2013
+build.number=302
diff --git a/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java b/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java
index 722d29c2..b52baef0 100644
--- a/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java
+++ b/src/me/StevenLawson/TotalFreedomMod/TFM_WorldEditBridge.java
@@ -2,8 +2,6 @@ package me.StevenLawson.TotalFreedomMod;
 
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
-import com.sk89q.worldedit.bukkit.BukkitServerInterface;
-import com.sk89q.worldedit.bukkit.WorldEditAPI;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -12,8 +10,6 @@ import org.bukkit.plugin.Plugin;
 public class TFM_WorldEditBridge
 {
     private WorldEditPlugin worldEditPlugin = null;
-    private WorldEditAPI worldEditAPI = null;
-    private BukkitServerInterface bukkitServerInterface = null;
 
     private TFM_WorldEditBridge()
     {
@@ -23,57 +19,56 @@ public class TFM_WorldEditBridge
     {
         if (this.worldEditPlugin == null)
         {
-            Plugin we = Bukkit.getServer().getPluginManager().getPlugin("WorldEdit");
-            if (we != null)
+            try
             {
-                if (we instanceof WorldEditPlugin)
+                Plugin we = Bukkit.getServer().getPluginManager().getPlugin("WorldEdit");
+                if (we != null)
                 {
-                    this.worldEditPlugin = (WorldEditPlugin) we;
+                    if (we instanceof WorldEditPlugin)
+                    {
+                        this.worldEditPlugin = (WorldEditPlugin) we;
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                TFM_Log.severe(ex);
+            }
         }
-
         return this.worldEditPlugin;
     }
 
-    public WorldEditAPI getWorldEditAPI()
-    {
-        if (this.worldEditAPI == null)
-        {
-            WorldEditPlugin wep = getWorldEditPlugin();
-            if (wep != null)
-            {
-                this.worldEditAPI = new WorldEditAPI(wep);
-            }
-        }
-
-        return this.worldEditAPI;
-    }
-
-    public BukkitServerInterface getBukkitServerInterface()
-    {
-        if (this.bukkitServerInterface == null)
-        {
-            WorldEditPlugin wep = this.getWorldEditPlugin();
-            if (wep != null)
-            {
-                this.bukkitServerInterface = new BukkitServerInterface(wep, Bukkit.getServer());
-            }
-        }
-
-        return this.bukkitServerInterface;
-    }
-
     public BukkitPlayer getBukkitPlayer(Player p)
     {
-        WorldEditPlugin wep = this.getWorldEditPlugin();
-        BukkitServerInterface bsi = this.getBukkitServerInterface();
-
-        if (wep != null && bsi != null)
+        try
         {
-            return new BukkitPlayer(wep, bsi, p);
+            WorldEditPlugin wep = this.getWorldEditPlugin();
+            if (wep != null)
+            {
+                return wep.wrapPlayer(p);
+            }
         }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
+        return null;
+    }
 
+    public LocalSession getPlayerSession(Player p)
+    {
+        try
+        {
+            WorldEditPlugin wep = this.getWorldEditPlugin();
+            if (wep != null)
+            {
+                return wep.getSession(p);
+            }
+        }
+        catch (Exception ex)
+        {
+            TFM_Log.severe(ex);
+        }
         return null;
     }
 
@@ -81,13 +76,12 @@ public class TFM_WorldEditBridge
     {
         try
         {
-            WorldEditAPI api = this.getWorldEditAPI();
-            if (api != null)
+            LocalSession session = getPlayerSession(p);
+            if (session != null)
             {
-                LocalSession session = api.getSession(p);
-                if (session != null)
+                BukkitPlayer bukkitPlayer = this.getBukkitPlayer(p);
+                if (bukkitPlayer != null)
                 {
-                    BukkitPlayer bukkitPlayer = this.getBukkitPlayer(p);
                     for (int i = 0; i < count; i++)
                     {
                         session.undo(session.getBlockBag(bukkitPlayer), bukkitPlayer);
@@ -105,14 +99,10 @@ public class TFM_WorldEditBridge
     {
         try
         {
-            WorldEditAPI api = this.getWorldEditAPI();
-            if (api != null)
+            LocalSession session = getPlayerSession(p);
+            if (session != null)
             {
-                LocalSession session = api.getSession(p);
-                if (session != null)
-                {
-                    session.setBlockChangeLimit(limit);
-                }
+                session.setBlockChangeLimit(limit);
             }
         }
         catch (Exception ex)