Revert "Merge pull request #134 from ImCarib/1.6.x"

This reverts commit 0b677cb4de, reversing
changes made to a355b1d0c8.

src/main/java/com/massivecraft/factions/FactionsPlugin.java

@@ -14,9 +14,6 @@ import com.massivecraft.factions.cmd.chest.AntiChestListener;
 import com.massivecraft.factions.cmd.reserve.ListParameterizedType;
 import com.massivecraft.factions.cmd.reserve.ReserveAdapter;
 import com.massivecraft.factions.cmd.reserve.ReserveObject;
-import com.massivecraft.factions.cmd.shields.struct.ShieldTCMP;
-import com.massivecraft.factions.cmd.shields.struct.frame.ShieldFrame;
-import com.massivecraft.factions.cmd.shields.struct.tasks.ShieldManagement;
 import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.discord.DiscordListener;
 import com.massivecraft.factions.integration.Econ;
@@ -183,7 +180,7 @@ public class FactionsPlugin extends MPlugin {
         }
 
         saveDefaultConfig();
-        reloadConfig();
+        this.reloadConfig();
         //Start wait task executor
         WaitExecutor.startTask();
         // Load Conf from disk
@@ -196,7 +193,6 @@ public class FactionsPlugin extends MPlugin {
 
         com.massivecraft.factions.integration.Essentials.setup();
         hookedPlayervaults = setupPlayervaults();
-        new ShieldTCMP();
         FPlayers.getInstance().load();
         Factions.getInstance().load();
 
@@ -220,7 +216,6 @@ public class FactionsPlugin extends MPlugin {
 
         Board.getInstance().load();
         Board.getInstance().clean();
-        new ShieldManagement();
         //Load command aliases
         Aliases.load();
         // Add Base Commands
@@ -430,7 +425,6 @@ public class FactionsPlugin extends MPlugin {
                 .registerTypeAdapter(Inventory.class, new InventoryTypeAdapter())
                 .registerTypeAdapter(ReserveObject.class, new ReserveAdapter())
                 .registerTypeAdapter(Location.class, new LocationTypeAdapter())
-                .registerTypeAdapter(ShieldFrame.class, new ShieldFrameAdapter())
                 .registerTypeAdapterFactory(EnumTypeAdapter.ENUM_FACTORY);
     }
 
@@ -488,6 +482,7 @@ public class FactionsPlugin extends MPlugin {
         Conf.save();
     }
 
+
     public Economy getEcon() {
         RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
         return rsp.getProvider();