Fixed claim using moderator checks instead of f perms

README.md

@@ -2,7 +2,7 @@
 
 ![Downloads](https://img.shields.io/github/downloads/driftay/saber-factions/total.svg) [![CodeFactor](https://www.codefactor.io/repository/github/driftay/saber-factions/badge)](https://www.codefactor.io/repository/github/driftay/saber-factions) [![License](https://img.shields.io/badge/license-GNU%20General%20Public%20License%20v3.0-brightgreen)](https://github.com/SaberLLC/Saber-Factions/blob/1.6.x/LICENSE) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/SaberLLC/Saber-Factions)
 
-SaberFactions is an exotic, performance optimized, and feature rich factions plugin that focuses on not only making the player experience as great as possibly but maintaining this aspect with the cost of NOTHING! We strive to continue development for SaberFactions as the factions community is strongly growing and seeking new players every day. 
+SaberFactions is an exotic, performance optmized, and feature rich factions plugin that focuses on not only making the player experience as great as possibly but maintaining this aspect with the cost of NOTHING! We strive to continue development for SaberFactions as the factions community is strongly growing and seeking new players every day. 
 
 ## Some Exciting Features
 Some of our features include the following 

javadoc/allclasses-frame.html

@@ -128,7 +128,7 @@
 <li><a href="com/massivecraft/factions/zcore/CommandVisibility.html" title="enum in com.massivecraft.factions.zcore" target="classFrame">CommandVisibility</a></li>
 <li><a href="com/massivecraft/factions/Conf.html" title="class in com.massivecraft.factions" target="classFrame">Conf</a></li>
 <li><a href="com/massivecraft/factions/Conf.Backend.html" title="enum in com.massivecraft.factions" target="classFrame">Conf.Backend</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">CropUpgrades</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">CropUpgrades</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/DiscUtil.html" title="class in com.massivecraft.factions.zcore.util" target="classFrame">DiscUtil</a></li>
 <li><a href="com/massivecraft/factions/integration/dynmap/DynmapStyle.html" title="class in com.massivecraft.factions.integration.dynmap" target="classFrame">DynmapStyle</a></li>
 <li><a href="com/massivecraft/factions/integration/Econ.html" title="class in com.massivecraft.factions.integration" target="classFrame">Econ</a></li>
@@ -136,7 +136,7 @@
 <li><a href="com/massivecraft/factions/integration/dynmap/EngineDynmap.html" title="class in com.massivecraft.factions.integration.dynmap" target="classFrame">EngineDynmap</a></li>
 <li><a href="com/massivecraft/factions/util/EnumTypeAdapter.html" title="class in com.massivecraft.factions.util" target="classFrame">EnumTypeAdapter</a></li>
 <li><a href="com/massivecraft/factions/integration/Essentials.html" title="class in com.massivecraft.factions.integration" target="classFrame">Essentials</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">EXPUpgrade</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">EXPUpgrade</a></li>
 <li><a href="com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions" target="classFrame"><span class="interfaceName">Faction</span></a></li>
 <li><a href="com/massivecraft/factions/event/FactionCreateEvent.html" title="class in com.massivecraft.factions.event" target="classFrame">FactionCreateEvent</a></li>
 <li><a href="com/massivecraft/factions/event/FactionDisbandEvent.html" title="class in com.massivecraft.factions.event" target="classFrame">FactionDisbandEvent</a></li>
@@ -171,7 +171,7 @@
 <li><a href="com/massivecraft/factions/scoreboards/FScoreboard.html" title="class in com.massivecraft.factions.scoreboards" target="classFrame">FScoreboard</a></li>
 <li><a href="com/massivecraft/factions/scoreboards/FSidebarProvider.html" title="class in com.massivecraft.factions.scoreboards" target="classFrame">FSidebarProvider</a></li>
 <li><a href="com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards" target="classFrame">FTeamWrapper</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">FUpgradesGUI</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">FUpgradesGUI</a></li>
 <li><a href="com/massivecraft/factions/zcore/nbtapi/utils/GsonWrapper.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils" target="classFrame">GsonWrapper</a></li>
 <li><a href="com/massivecraft/factions/util/InventoryTypeAdapter.html" title="class in com.massivecraft.factions.util" target="classFrame">InventoryTypeAdapter</a></li>
 <li><a href="com/massivecraft/factions/util/InventoryUtil.html" title="class in com.massivecraft.factions.util" target="classFrame">InventoryUtil</a></li>
@@ -242,7 +242,7 @@
            title="class in com.massivecraft.factions">SaberFactions</a></li>
 <li><a href="com/massivecraft/factions/zcore/persist/SaveTask.html" title="class in com.massivecraft.factions.zcore.persist" target="classFrame">SaveTask</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/SmokeUtil.html" title="class in com.massivecraft.factions.zcore.util" target="classFrame">SmokeUtil</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
 <li><a href="com/massivecraft/factions/util/SpiralTask.html" title="class in com.massivecraft.factions.util" target="classFrame">SpiralTask</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util" target="classFrame">TagReplacer</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/TagReplacer.TagType.html" title="enum in com.massivecraft.factions.zcore.util" target="classFrame">TagReplacer.TagType</a></li>

javadoc/allclasses-index.html

@@ -942,7 +942,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <th class="colLast" scope="row">&nbsp;</th>
 </tr>
 <tr class="rowColor" id="i207">
-<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></td>
+<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></td>
 <th class="colLast" scope="row">&nbsp;</th>
 </tr>
 <tr class="altColor" id="i208">
@@ -1364,11 +1364,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </th>
 </tr>
 <tr class="rowColor" id="i301">
-<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></td>
+<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></td>
 <th class="colLast" scope="row">&nbsp;</th>
 </tr>
 <tr class="altColor" id="i302">
-<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></td>
+<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></td>
 <th class="colLast" scope="row">&nbsp;</th>
 </tr>
 <tr class="rowColor" id="i303">

javadoc/allclasses-noframe.html

@@ -128,7 +128,7 @@
 <li><a href="com/massivecraft/factions/zcore/CommandVisibility.html" title="enum in com.massivecraft.factions.zcore">CommandVisibility</a></li>
 <li><a href="com/massivecraft/factions/Conf.html" title="class in com.massivecraft.factions">Conf</a></li>
 <li><a href="com/massivecraft/factions/Conf.Backend.html" title="enum in com.massivecraft.factions">Conf.Backend</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">CropUpgrades</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades">CropUpgrades</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/DiscUtil.html" title="class in com.massivecraft.factions.zcore.util">DiscUtil</a></li>
 <li><a href="com/massivecraft/factions/integration/dynmap/DynmapStyle.html" title="class in com.massivecraft.factions.integration.dynmap">DynmapStyle</a></li>
 <li><a href="com/massivecraft/factions/integration/Econ.html" title="class in com.massivecraft.factions.integration">Econ</a></li>
@@ -136,7 +136,7 @@
 <li><a href="com/massivecraft/factions/integration/dynmap/EngineDynmap.html" title="class in com.massivecraft.factions.integration.dynmap">EngineDynmap</a></li>
 <li><a href="com/massivecraft/factions/util/EnumTypeAdapter.html" title="class in com.massivecraft.factions.util">EnumTypeAdapter</a></li>
 <li><a href="com/massivecraft/factions/integration/Essentials.html" title="class in com.massivecraft.factions.integration">Essentials</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">EXPUpgrade</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades">EXPUpgrade</a></li>
 <li><a href="com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions"><span class="interfaceName">Faction</span></a></li>
 <li><a href="com/massivecraft/factions/event/FactionCreateEvent.html" title="class in com.massivecraft.factions.event">FactionCreateEvent</a></li>
 <li><a href="com/massivecraft/factions/event/FactionDisbandEvent.html" title="class in com.massivecraft.factions.event">FactionDisbandEvent</a></li>
@@ -171,7 +171,7 @@
 <li><a href="com/massivecraft/factions/scoreboards/FScoreboard.html" title="class in com.massivecraft.factions.scoreboards">FScoreboard</a></li>
 <li><a href="com/massivecraft/factions/scoreboards/FSidebarProvider.html" title="class in com.massivecraft.factions.scoreboards">FSidebarProvider</a></li>
 <li><a href="com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards">FTeamWrapper</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></li>
 <li><a href="com/massivecraft/factions/zcore/nbtapi/utils/GsonWrapper.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils">GsonWrapper</a></li>
 <li><a href="com/massivecraft/factions/util/InventoryTypeAdapter.html" title="class in com.massivecraft.factions.util">InventoryTypeAdapter</a></li>
 <li><a href="com/massivecraft/factions/util/InventoryUtil.html" title="class in com.massivecraft.factions.util">InventoryUtil</a></li>
@@ -242,7 +242,7 @@
     </li>
 <li><a href="com/massivecraft/factions/zcore/persist/SaveTask.html" title="class in com.massivecraft.factions.zcore.persist">SaveTask</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/SmokeUtil.html" title="class in com.massivecraft.factions.zcore.util">SmokeUtil</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">SpawnerUpgrades</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades">SpawnerUpgrades</a></li>
 <li><a href="com/massivecraft/factions/util/SpiralTask.html" title="class in com.massivecraft.factions.util">SpiralTask</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer</a></li>
 <li><a href="com/massivecraft/factions/zcore/util/TagReplacer.TagType.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer.TagType</a></li>

javadoc/allpackages-index.html

@@ -223,7 +223,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></th>
+<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor">

javadoc/com/massivecraft/factions/Faction.html

@@ -630,7 +630,7 @@ extends <a href="iface/EconomyParticipator.html" title="interface in com.massive
 </tr>
 <tr class="altColor" id="i96">
 <td class="colFirst"><code>int</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor" id="i97">
@@ -1066,7 +1066,7 @@ extends <a href="iface/EconomyParticipator.html" title="interface in com.massive
 </tr>
 <tr class="rowColor" id="i181">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
           int&nbsp;level)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -1743,23 +1743,23 @@ extends <a href="iface/EconomyParticipator.html" title="interface in com.massive
 <pre class="methodSignature">void&nbsp;deinvite&#8203;(<a href="FPlayer.html" title="interface in com.massivecraft.factions">FPlayer</a>&nbsp;fplayer)</pre>
 </li>
 </ul>
-<a id="setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">
+<a id="setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpgrade</h4>
-<pre class="methodSignature">void&nbsp;setUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
+<pre class="methodSignature">void&nbsp;setUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
                 int&nbsp;level)</pre>
 </li>
 </ul>
-<a id="getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">
+<a id="getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getUpgrade</h4>
-<pre class="methodSignature">int&nbsp;getUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
+<pre class="methodSignature">int&nbsp;getUpgrade&#8203;(<a href="zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
 </li>
 </ul>
 <a id="isInvited(com.massivecraft.factions.FPlayer)">

javadoc/com/massivecraft/factions/util/FactionWarpsFrame.html

@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.frame.fdisband.FactionWarpsFrame</li>
+<li>com.massivecraft.factions.util.FactionWarpsFrame</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/util/InventoryTypeAdapter.html

@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.util.adapters.InventoryTypeAdapter</li>
+<li>com.massivecraft.factions.util.InventoryTypeAdapter</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/util/LocationTypeAdapter.html

@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.util.adapters.LocationTypeAdapter</li>
+<li>com.massivecraft.factions.util.LocationTypeAdapter</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/util/MapFLocToStringSetTypeAdapter.html

@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.util.adapters.MapFLocToStringSetTypeAdapter</li>
+<li>com.massivecraft.factions.util.MapFLocToStringSetTypeAdapter</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/util/MyLocationTypeAdapter.html

@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.util.adapters.MyLocationTypeAdapter</li>
+<li>com.massivecraft.factions.util.MyLocationTypeAdapter</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/util/PermissionsMapTypeAdapter.html

@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.util.adapters.PermissionsMapTypeAdapter</li>
+<li>com.massivecraft.factions.util.PermissionsMapTypeAdapter</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html

@@ -49,7 +49,7 @@ var activeTableTab = "activeTableTab";
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" target="_top">Frames</a></li>
@@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">com.massivecraft.factions.zcore.frame.fupgrades</div>
+<div class="subTitle">com.massivecraft.factions.zcore.fupgrades</div>
 <h2 title="Class CropUpgrades" class="title">Class CropUpgrades</h2>
 </div>
 <div class="contentContainer">
@@ -99,7 +99,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.frame.fupgrades.CropUpgrades</li>
+<li>com.massivecraft.factions.zcore.fupgrades.CropUpgrades</li>
 </ul>
 </li>
 </ul>
@@ -230,7 +230,7 @@ implements org.bukkit.event.Listener</pre>
 <div class="subNav">
 <ul class="navList">
 <li>Prev&nbsp;Class</li>
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" target="_top">Frames</a></li>

javadoc/com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html

@@ -48,8 +48,8 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" target="_top">Frames</a></li>
@@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">com.massivecraft.factions.zcore.frame.fupgrades</div>
+<div class="subTitle">com.massivecraft.factions.zcore.fupgrades</div>
 <h2 title="Class EXPUpgrade" class="title">Class EXPUpgrade</h2>
 </div>
 <div class="contentContainer">
@@ -99,7 +99,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.frame.fupgrades.EXPUpgrade</li>
+<li>com.massivecraft.factions.zcore.fupgrades.EXPUpgrade</li>
 </ul>
 </li>
 </ul>
@@ -229,8 +229,8 @@ implements org.bukkit.event.Listener</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Next&nbsp;Class</span></a></li>
 </ul>
 <ul class="navList">
 <li><a href="../../../../../index.html?com/massivecraft/factions/zcore/fupgrades/EXPUpgrade.html" target="_top">Frames</a></li>

javadoc/com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html

@@ -99,7 +99,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!-- ======== START OF CLASS DATA ======== -->
 <main role="main">
 <div class="header">
-<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></div>
 <h2 title="Class FUpgradesGUI" class="title">Class FUpgradesGUI</h2>
 </div>
 <div class="contentContainer">
@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.frame.fupgrades.FUpgradesGUI</li>
+<li>com.massivecraft.factions.zcore.fupgrades.FUpgradesGUI</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/zcore/fupgrades/SpawnerUpgrades.html

@@ -48,7 +48,7 @@ var activeTableTab = "activeTableTab";
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">
@@ -91,7 +91,7 @@ var activeTableTab = "activeTableTab";
 <!-- ========= END OF TOP NAVBAR ========= -->
 <!-- ======== START OF CLASS DATA ======== -->
 <div class="header">
-<div class="subTitle">com.massivecraft.factions.zcore.frame.fupgrades</div>
+<div class="subTitle">com.massivecraft.factions.zcore.fupgrades</div>
 <h2 title="Class SpawnerUpgrades" class="title">Class SpawnerUpgrades</h2>
 </div>
 <div class="contentContainer">
@@ -99,7 +99,7 @@ var activeTableTab = "activeTableTab";
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.frame.fupgrades.SpawnerUpgrades</li>
+<li>com.massivecraft.factions.zcore.fupgrades.SpawnerUpgrades</li>
 </ul>
 </li>
 </ul>
@@ -229,7 +229,7 @@ implements org.bukkit.event.Listener</pre>
 </div>
 <div class="subNav">
 <ul class="navList">
-<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
+<li><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">Prev&nbsp;Class</span></a></li>
 <li>Next&nbsp;Class</li>
 </ul>
 <ul class="navList">

javadoc/com/massivecraft/factions/zcore/fupgrades/UpgradeType.html

@@ -99,7 +99,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!-- ======== START OF CLASS DATA ======== -->
 <main role="main">
 <div class="header">
-<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></div>
 <h2 title="Enum UpgradeType" class="title">Enum UpgradeType</h2>
 </div>
 <div class="contentContainer">
@@ -107,10 +107,10 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</li>
+<li>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType</li>
+<li>com.massivecraft.factions.zcore.fupgrades.UpgradeType</li>
 </ul>
 </li>
 </ul>
@@ -121,11 +121,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="blockList">
 <dl>
 <dt>All Implemented Interfaces:</dt>
-<dd><code>java.io.Serializable</code>, <code>java.lang.Comparable&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</code>, <code>java.lang.constant.Constable</code></dd>
+<dd><code>java.io.Serializable</code>, <code>java.lang.Comparable&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</code>, <code>java.lang.constant.Constable</code></dd>
 </dl>
 <hr>
 <pre>public enum <span class="typeNameLabel">UpgradeType</span>
-extends java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</pre>
+extends java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</pre>
 </li>
 </ul>
 </div>
@@ -241,14 +241,14 @@ extends java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivec
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor" id="i1">
-<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></code></td>
+<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#valueOf(java.lang.String)">valueOf</a></span>&#8203;(java.lang.String&nbsp;name)</code></th>
 <td class="colLast">
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </td>
 </tr>
 <tr class="altColor" id="i2">
-<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>[]</code></td>
+<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>[]</code></td>
 <th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#values()">values</a></span>()</code></th>
 <td class="colLast">
 <div class="block">Returns an array containing the constants of this enum type, in
@@ -295,7 +295,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>CHEST</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> CHEST</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> CHEST</pre>
 </li>
 </ul>
 <a id="SPAWNER">
@@ -304,7 +304,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>SPAWNER</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> SPAWNER</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> SPAWNER</pre>
 </li>
 </ul>
 <a id="EXP">
@@ -313,7 +313,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>EXP</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> EXP</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> EXP</pre>
 </li>
 </ul>
 <a id="CROP">
@@ -322,7 +322,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>CROP</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> CROP</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> CROP</pre>
 </li>
 </ul>
 <a id="POWER">
@@ -331,7 +331,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>POWER</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> POWER</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> POWER</pre>
 </li>
 </ul>
 <a id="REDSTONE">
@@ -340,7 +340,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>REDSTONE</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> REDSTONE</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> REDSTONE</pre>
 </li>
 </ul>
 <a id="MEMBERS">
@@ -349,7 +349,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>MEMBERS</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> MEMBERS</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> MEMBERS</pre>
 </li>
 </ul>
 <a id="TNT">
@@ -358,7 +358,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>TNT</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> TNT</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> TNT</pre>
 </li>
 </ul>
 <a id="WARP">
@@ -367,7 +367,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>WARP</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> WARP</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> WARP</pre>
 </li>
 </ul>
 <a id="DAMAGEINCREASE">
@@ -376,7 +376,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>DAMAGEINCREASE</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> DAMAGEINCREASE</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> DAMAGEINCREASE</pre>
 </li>
 </ul>
 <a id="DAMAGEDECREASE">
@@ -385,7 +385,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>DAMAGEDECREASE</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> DAMAGEDECREASE</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> DAMAGEDECREASE</pre>
 </li>
 </ul>
 <a id="REINFORCEDARMOR">
@@ -394,7 +394,7 @@ the order they are declared.</div>
 <ul class="blockListLast">
 <li class="blockList">
 <h4>REINFORCEDARMOR</h4>
-<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a> REINFORCEDARMOR</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a> REINFORCEDARMOR</pre>
 </li>
 </ul>
 </li>
@@ -413,7 +413,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>values</h4>
-<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>[]&nbsp;values()</pre>
+<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>[]&nbsp;values()</pre>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 <dl>
@@ -428,7 +428,7 @@ the order they are declared.</div>
 <ul class="blockList">
 <li class="blockList">
 <h4>valueOf</h4>
-<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;valueOf&#8203;(java.lang.String&nbsp;name)</pre>
+<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;valueOf&#8203;(java.lang.String&nbsp;name)</pre>
 <div class="block">Returns the enum constant of this type with the specified name.
 The string must match <i>exactly</i> an identifier used to declare an
 enum constant in this type.  (Extraneous whitespace characters are 
@@ -453,7 +453,7 @@ not permitted.)</div>
 <pre class="methodSignature">public&nbsp;java.lang.String&nbsp;toString()</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Overrides:</span></dt>
-<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</code></dd>
+<dd><code>toString</code>&nbsp;in class&nbsp;<code>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&gt;</code></dd>
 </dl>
 </li>
 </ul>

javadoc/com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html

@@ -99,7 +99,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <!-- ======== START OF CLASS DATA ======== -->
 <main role="main">
 <div class="header">
-<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></div>
 <h2 title="Class UpgradesListener" class="title">Class UpgradesListener</h2>
 </div>
 <div class="contentContainer">
@@ -107,7 +107,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li>java.lang.Object</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.frame.fupgrades.UpgradesListener</li>
+<li>com.massivecraft.factions.zcore.fupgrades.UpgradesListener</li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/zcore/fupgrades/package-frame.html

@@ -3,20 +3,20 @@
 <html lang="en">
 <head>
     <!-- Generated by javadoc (1.8.0_191) on Thu Dec 06 16:05:50 CST 2018 -->
-<title>com.massivecraft.factions.zcore.frame.fupgrades</title>
+<title>com.massivecraft.factions.zcore.fupgrades</title>
     <meta content="2018-12-06" name="date">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
 <script type="text/javascript" src="../../../../../script.js"></script>
 </head>
 <body>
-<h1 class="bar"><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/package-summary.html" target="classFrame">com.massivecraft.factions.zcore.frame.fupgrades</a></h1>
+<h1 class="bar"><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/package-summary.html" target="classFrame">com.massivecraft.factions.zcore.fupgrades</a></h1>
 <div class="indexContainer">
 <h2 title="Classes">Classes</h2>
 <ul title="Classes">
-<li><a href="CropUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">CropUpgrades</a></li>
-<li><a href="EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">EXPUpgrade</a></li>
-<li><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">FUpgradesGUI</a></li>
-<li><a href="SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
+<li><a href="CropUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">CropUpgrades</a></li>
+<li><a href="EXPUpgrade.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">EXPUpgrade</a></li>
+<li><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">FUpgradesGUI</a></li>
+<li><a href="SpawnerUpgrades.html" title="class in com.massivecraft.factions.zcore.fupgrades" target="classFrame">SpawnerUpgrades</a></li>
 </ul>
 </div>
 </body>

javadoc/com/massivecraft/factions/zcore/fupgrades/package-summary.html

@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (12.0.1) on Fri Nov 01 13:30:56 CDT 2019 -->
-<title>com.massivecraft.factions.zcore.frame.fupgrades</title>
+<title>com.massivecraft.factions.zcore.fupgrades</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="dc.created" content="2019-11-01">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
@@ -77,7 +77,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </header>
 <main role="main">
 <div class="header">
-<h1 title="Package" class="title">Package&nbsp;com.massivecraft.factions.zcore.frame.fupgrades</h1>
+<h1 title="Package" class="title">Package&nbsp;com.massivecraft.factions.zcore.fupgrades</h1>
 </div>
 <div class="contentContainer">
 <ul class="blockList">
@@ -91,11 +91,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tbody>
 <tr class="altColor">
-<th class="colFirst" scope="row"><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></th>
+<th class="colFirst" scope="row"><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor">
-<th class="colFirst" scope="row"><a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></th>
+<th class="colFirst" scope="row"><a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>
@@ -112,7 +112,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </tr>
 <tbody>
 <tr class="altColor">
-<th class="colFirst" scope="row"><a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></th>
+<th class="colFirst" scope="row"><a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 </tbody>

javadoc/com/massivecraft/factions/zcore/fupgrades/package-tree.html

@@ -3,7 +3,7 @@
 <html lang="en">
 <head>
 <!-- Generated by javadoc (12.0.1) on Fri Nov 01 13:30:56 CDT 2019 -->
-<title>com.massivecraft.factions.zcore.frame.fupgrades Class Hierarchy</title>
+<title>com.massivecraft.factions.zcore.fupgrades Class Hierarchy</title>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta name="dc.created" content="2019-11-01">
 <link rel="stylesheet" type="text/css" href="../../../../../stylesheet.css" title="Style">
@@ -22,7 +22,7 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.massivecraft.factions.zcore.frame.fupgrades Class Hierarchy";
+            parent.document.title="com.massivecraft.factions.zcore.fupgrades Class Hierarchy";
         }
     }
     catch(err) {
@@ -77,7 +77,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </header>
 <main role="main">
 <div class="header">
-<h1 class="title">Hierarchy For Package com.massivecraft.factions.zcore.frame.fupgrades</h1>
+<h1 class="title">Hierarchy For Package com.massivecraft.factions.zcore.fupgrades</h1>
 <span class="packageHierarchyLabel">Package Hierarchies:</span>
 <ul class="horizontal">
 <li><a href="../../../../../overview-tree.html">All Packages</a></li>
@@ -89,8 +89,8 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <ul>
 <li class="circle">java.lang.Object
 <ul>
-<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
-<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
+<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
+<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
 </ul>
 </li>
 </ul>
@@ -102,7 +102,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <ul>
 <li class="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.lang.constant.Constable, java.io.Serializable)
 <ul>
-<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
+<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
 </ul>
 </li>
 </ul>

javadoc/com/massivecraft/factions/zcore/persist/MemoryFaction.html

@@ -888,7 +888,7 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
 </tr>
 <tr class="altColor" id="i98">
 <td class="colFirst"><code>int</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor" id="i99">
@@ -1334,7 +1334,7 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
 </tr>
 <tr class="rowColor" id="i185">
 <td class="colFirst"><code>void</code></td>
-<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
+<th class="colSecond" scope="row"><code><span class="memberNameLink"><a href="#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
           int&nbsp;level)</code></th>
 <td class="colLast">&nbsp;</td>
 </tr>
@@ -2455,16 +2455,16 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
 </dl>
 </li>
 </ul>
-<a id="getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">
+<a id="getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>getUpgrade</h4>
-<pre class="methodSignature">public&nbsp;int&nbsp;getUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
+<pre class="methodSignature">public&nbsp;int&nbsp;getUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../Faction.html#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
+<dd><code><a href="../../Faction.html#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
 </dl>
 </li>
 </ul>
@@ -2598,17 +2598,17 @@ implements <a href="../../Faction.html" title="interface in com.massivecraft.fac
 </dl>
 </li>
 </ul>
-<a id="setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">
+<a id="setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">
 <!--   -->
 </a>
 <ul class="blockList">
 <li class="blockList">
 <h4>setUpgrade</h4>
-<pre class="methodSignature">public&nbsp;void&nbsp;setUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
+<pre class="methodSignature">public&nbsp;void&nbsp;setUpgrade&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
                        int&nbsp;level)</pre>
 <dl>
 <dt><span class="overrideSpecifyLabel">Specified by:</span></dt>
-<dd><code><a href="../../Faction.html#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
+<dd><code><a href="../../Faction.html#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade</a></code>&nbsp;in interface&nbsp;<code><a href="../../Faction.html" title="interface in com.massivecraft.factions">Faction</a></code></dd>
 </dl>
 </li>
 </ul>

javadoc/element-list

@@ -31,7 +31,7 @@ com.massivecraft.factions.util.Particles
 com.massivecraft.factions.zcore
 com.massivecraft.factions.zcore.fperms
 com.massivecraft.factions.zcore.fperms.gui
-com.massivecraft.factions.zcore.frame.fupgrades
+com.massivecraft.factions.zcore.fupgrades
 com.massivecraft.factions.zcore.nbtapi
 com.massivecraft.factions.zcore.nbtapi.utils
 com.massivecraft.factions.zcore.persist

javadoc/index-files/index-13.html

@@ -235,7 +235,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/cmd/CommandRequirements.Builder.html#memberOnly()">memberOnly()</a></span> - Method in class com.massivecraft.factions.cmd.<a href="../com/massivecraft/factions/cmd/CommandRequirements.Builder.html" title="class in com.massivecraft.factions.cmd">CommandRequirements.Builder</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#MEMBERS">MEMBERS</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#MEMBERS">MEMBERS</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="../com/massivecraft/factions/zcore/persist/MemoryBoard.html" title="class in com.massivecraft.factions.zcore.persist"><span class="typeNameLink">MemoryBoard</span></a> - Class in <a href="../com/massivecraft/factions/zcore/persist/package-summary.html">com.massivecraft.factions.zcore.persist</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-15.html

@@ -129,7 +129,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TagReplacer.html#OFFLINE_LIST">OFFLINE_LIST</a></span> - com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onArmorDamage(org.bukkit.event.player.PlayerItemDamageEvent)">onArmorDamage(PlayerItemDamageEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onArmorDamage(org.bukkit.event.player.PlayerItemDamageEvent)">onArmorDamage(PlayerItemDamageEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html#onBannerBreak(org.bukkit.event.block.BlockBreakEvent)">onBannerBreak(BlockBreakEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html" title="class in com.massivecraft.factions.listeners">FactionsBlockListener</a></dt>
 <dd>&nbsp;</dd>
@@ -163,7 +163,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/FactionGUI.html#onClick(int,org.bukkit.event.inventory.ClickType)">onClick(int, ClickType)</a></span> - Method in interface com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/FactionGUI.html" title="interface in com.massivecraft.factions.util">FactionGUI</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#onClick(org.bukkit.event.inventory.InventoryClickEvent)">onClick(InventoryClickEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#onClick(org.bukkit.event.inventory.InventoryClickEvent)">onClick(InventoryClickEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html#onClose(org.bukkit.event.inventory.InventoryCloseEvent)">onClose(InventoryCloseEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html" title="class in com.massivecraft.factions.listeners">FactionsPlayerListener</a></dt>
 <dd>&nbsp;</dd>
@@ -175,19 +175,19 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html#onCreeperGlitch(org.bukkit.event.entity.EntityDamageEvent)">onCreeperGlitch(EntityDamageEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html" title="class in com.massivecraft.factions.listeners">FactionsEntityListener</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onCropGrow(org.bukkit.event.block.BlockGrowEvent)">onCropGrow(BlockGrowEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onCropGrow(org.bukkit.event.block.BlockGrowEvent)">onCropGrow(BlockGrowEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html#onDamage(org.bukkit.event.entity.EntityDamageEvent)">onDamage(EntityDamageEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsPlayerListener.html" title="class in com.massivecraft.factions.listeners">FactionsPlayerListener</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageIncrease(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageIncrease(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageIncrease(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageIncrease(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageReduction(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageReduction(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDamageReduction(org.bukkit.event.entity.EntityDamageByEntityEvent)">onDamageReduction(EntityDamageByEntityEvent)</a></span> - Static method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FPlayer.html#onDeath()">onDeath()</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/FPlayer.html" title="interface in com.massivecraft.factions">FPlayer</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFPlayer.html#onDeath()">onDeath()</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFPlayer.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFPlayer</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDeath(org.bukkit.event.entity.EntityDeathEvent)">onDeath(EntityDeathEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onDeath(org.bukkit.event.entity.EntityDeathEvent)">onDeath(EntityDeathEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FactionsPlugin.html#onDisable()">onDisable()</a></span> - Method in class com.massivecraft.factions.<a href="../com/massivecraft/factions/FactionsPlugin.html" title="class in com.massivecraft.factions">FactionsPlugin</a></dt>
 <dd>&nbsp;</dd>
@@ -307,7 +307,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html#onPotionSplashEvent(org.bukkit.event.entity.PotionSplashEvent)">onPotionSplashEvent(PotionSplashEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsEntityListener.html" title="class in com.massivecraft.factions.listeners">FactionsEntityListener</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onSpawn(org.bukkit.event.entity.SpawnerSpawnEvent)">onSpawn(SpawnerSpawnEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onSpawn(org.bukkit.event.entity.SpawnerSpawnEvent)">onSpawn(SpawnerSpawnEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FactionsPlugin.html#onTabComplete(org.bukkit.command.CommandSender,org.bukkit.command.Command,java.lang.String,java.lang.String%5B%5D)">onTabComplete(CommandSender, Command, String, String[])</a></span> - Method in class com.massivecraft.factions.<a href="../com/massivecraft/factions/FactionsPlugin.html" title="class in com.massivecraft.factions">FactionsPlugin</a></dt>
 <dd>&nbsp;</dd>
@@ -319,13 +319,13 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html#onVaultPlace(org.bukkit.event.block.BlockPlaceEvent)">onVaultPlace(BlockPlaceEvent)</a></span> - Method in class com.massivecraft.factions.listeners.<a href="../com/massivecraft/factions/listeners/FactionsBlockListener.html" title="class in com.massivecraft.factions.listeners">FactionsBlockListener</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onWaterRedstone(org.bukkit.event.block.BlockFromToEvent)">onWaterRedstone(BlockFromToEvent)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#onWaterRedstone(org.bukkit.event.block.BlockFromToEvent)">onWaterRedstone(BlockFromToEvent)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#open">open</a></span> - Variable in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/struct/Permission.html#OPEN">OPEN</a></span> - com.massivecraft.factions.struct.<a href="../com/massivecraft/factions/struct/Permission.html" title="enum in com.massivecraft.factions.struct">Permission</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#openMainMenu(com.massivecraft.factions.FPlayer)">openMainMenu(FPlayer)</a></span> - Method in class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#openMainMenu(com.massivecraft.factions.FPlayer)">openMainMenu(FPlayer)</a></span> - Method in class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/cmd/FCommand.html#optionalArgs">optionalArgs</a></span> - Variable in class com.massivecraft.factions.cmd.<a href="../com/massivecraft/factions/cmd/FCommand.html" title="class in com.massivecraft.factions.cmd">FCommand</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-16.html

@@ -922,7 +922,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/tag/FactionTag.html#POWER">POWER</a></span> - com.massivecraft.factions.tag.<a href="../com/massivecraft/factions/tag/FactionTag.html" title="enum in com.massivecraft.factions.tag">FactionTag</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#POWER">POWER</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#POWER">POWER</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TagReplacer.html#POWER">POWER</a></span> - com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util">TagReplacer</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-18.html

@@ -193,7 +193,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#REDSTONE">REDSTONE</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REDSTONE">REDSTONE</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REDSTONE">REDSTONE</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#REDSTONE_BLOCK">REDSTONE_BLOCK</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>
@@ -239,7 +239,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/FLocation.html#regionToChunk(int)">regionToChunk(int)</a></span> - Static method in class com.massivecraft.factions.<a href="../com/massivecraft/factions/FLocation.html" title="class in com.massivecraft.factions">FLocation</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REINFORCEDARMOR">REINFORCEDARMOR</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#REINFORCEDARMOR">REINFORCEDARMOR</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><a href="../com/massivecraft/factions/struct/Relation.html" title="enum in com.massivecraft.factions.struct"><span class="typeNameLink">Relation</span></a> - Enum in <a href="../com/massivecraft/factions/struct/package-summary.html">com.massivecraft.factions.struct</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-19.html

@@ -757,9 +757,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">This method hooks into all permission plugins we are supporting</div>
 </dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#setUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#setUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType,int)">setUpgrade(UpgradeType, int)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/Particles/ReflectionUtils.html#setValue(java.lang.Object,boolean,java.lang.String,java.lang.Object)">setValue(Object, boolean, String, Object)</a></span> - Static method in class com.massivecraft.factions.util.Particles.<a href="../com/massivecraft/factions/util/Particles/ReflectionUtils.html" title="class in com.massivecraft.factions.util.Particles">ReflectionUtils</a></dt>
 <dd>
@@ -1009,7 +1009,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#SPAWNER">SPAWNER</a></span> - com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#SPAWNER">SPAWNER</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#SPAWNER">SPAWNER</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Conf.html#spawnerLock">spawnerLock</a></span> - Static variable in class com.massivecraft.factions.<a href="../com/massivecraft/factions/Conf.html" title="class in com.massivecraft.factions">Conf</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-20.html

@@ -236,7 +236,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#TNT">TNT</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#TNT">TNT</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#TNT">TNT</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#TNT_MINECART">TNT_MINECART</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>
@@ -284,7 +284,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#toString()">toString()</a></span> - Method in enum com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#toString()">toString()</a></span> - Method in enum com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#toString()">toString()</a></span> - Method in enum com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/nbtapi/NBTCompound.html#toString()">toString()</a></span> - Method in class com.massivecraft.factions.zcore.nbtapi.<a href="../com/massivecraft/factions/zcore/nbtapi/NBTCompound.html" title="class in com.massivecraft.factions.zcore.nbtapi">NBTCompound</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-21.html

@@ -139,11 +139,11 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/struct/Permission.html#UPGRADES">UPGRADES</a></span> - com.massivecraft.factions.struct.<a href="../com/massivecraft/factions/struct/Permission.html" title="enum in com.massivecraft.factions.struct">Permission</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></dt>
+<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#%3Cinit%3E()">UpgradesListener()</a></span> - Constructor for class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html#%3Cinit%3E()">UpgradesListener()</a></span> - Constructor for class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradeType</span></a> - Enum in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></dt>
+<dt><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradeType</span></a> - Enum in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TextUtil.html#upperCaseFirst(java.lang.String)">upperCaseFirst(String)</a></span> - Static method in class com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TextUtil.html" title="class in com.massivecraft.factions.zcore.util">TextUtil</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-22.html

@@ -213,7 +213,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#valueOf(java.lang.String)">valueOf(String)</a></span> - Static method in enum com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>
 <div class="block">Returns the enum constant of this type with the specified name.</div>
 </dd>
@@ -362,7 +362,7 @@ the order they are declared.</div>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>
 </dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#values()">values()</a></span> - Static method in enum com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#values()">values()</a></span> - Static method in enum com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>
 <div class="block">Returns an array containing the constants of this enum type, in
 the order they are declared.</div>

javadoc/index-files/index-23.html

@@ -123,7 +123,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#WARP">WARP</a></span> - com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#WARP">WARP</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#WARP">WARP</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#warpPasswords">warpPasswords</a></span> - Variable in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-3.html

@@ -347,7 +347,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html#CHEST">CHEST</a></span> - com.massivecraft.factions.zcore.fperms.<a href="../com/massivecraft/factions/zcore/fperms/PermissableAction.html" title="enum in com.massivecraft.factions.zcore.fperms">PermissableAction</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CHEST">CHEST</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CHEST">CHEST</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/util/TL.html#CHEST_ITEM_DENIED_TRANSFER">CHEST_ITEM_DENIED_TRANSFER</a></span> - com.massivecraft.factions.zcore.util.<a href="../com/massivecraft/factions/zcore/util/TL.html" title="enum in com.massivecraft.factions.zcore.util">TL</a></dt>
 <dd>&nbsp;</dd>
@@ -1445,7 +1445,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><a href="../com/massivecraft/factions/zcore/fperms/gui/package-summary.html">com.massivecraft.factions.zcore.fperms.gui</a> - package com.massivecraft.factions.zcore.fperms.gui</dt>
 <dd>&nbsp;</dd>
-<dt><a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a> - package com.massivecraft.factions.zcore.frame.fupgrades</dt>
+<dt><a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a> - package com.massivecraft.factions.zcore.fupgrades</dt>
 <dd>&nbsp;</dd>
 <dt><a href="../com/massivecraft/factions/zcore/nbtapi/package-summary.html">com.massivecraft.factions.zcore.nbtapi</a> - package com.massivecraft.factions.zcore.nbtapi</dt>
 <dd>&nbsp;</dd>
@@ -3103,7 +3103,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
  The speed value influences the velocity at which the particle flies off
  </div>
 </dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CROP">CROP</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#CROP">CROP</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#CROSSBOW">CROSSBOW</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-4.html

@@ -87,9 +87,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#DAMAGED_ANVIL">DAMAGED_ANVIL</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEDECREASE">DAMAGEDECREASE</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEDECREASE">DAMAGEDECREASE</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEINCREASE">DAMAGEINCREASE</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#DAMAGEINCREASE">DAMAGEINCREASE</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#DANDELION">DANDELION</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-5.html

@@ -279,7 +279,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/MCommand.html#execute(org.bukkit.command.CommandSender,java.util.List,java.util.List)">execute(CommandSender, List&lt;String&gt;, List&lt;MCommand&lt;?&gt;&gt;)</a></span> - Method in class com.massivecraft.factions.zcore.<a href="../com/massivecraft/factions/zcore/MCommand.html" title="class in com.massivecraft.factions.zcore">MCommand</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#EXP">EXP</a></span> - com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html#EXP">EXP</a></span> - com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#EXPERIENCE_BOTTLE">EXPERIENCE_BOTTLE</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-6.html

@@ -533,9 +533,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><a href="../com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards"><span class="typeNameLink">FTeamWrapper</span></a> - Class in <a href="../com/massivecraft/factions/scoreboards/package-summary.html">com.massivecraft.factions.scoreboards</a></dt>
 <dd>&nbsp;</dd>
-<dt><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></dt>
+<dt><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> - Class in <a href="../com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#%3Cinit%3E()">FUpgradesGUI()</a></span> - Constructor for class com.massivecraft.factions.zcore.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">FUpgradesGUI</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html#%3Cinit%3E()">FUpgradesGUI()</a></span> - Constructor for class com.massivecraft.factions.zcore.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades">FUpgradesGUI</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/util/XMaterial.html#FURNACE">FURNACE</a></span> - com.massivecraft.factions.util.<a href="../com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util">XMaterial</a></dt>
 <dd>&nbsp;</dd>

javadoc/index-files/index-7.html

@@ -1528,9 +1528,9 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/nbtapi/utils/MethodNames.html#getTypeMethodName()">getTypeMethodName()</a></span> - Static method in class com.massivecraft.factions.zcore.nbtapi.utils.<a href="../com/massivecraft/factions/zcore/nbtapi/utils/MethodNames.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils">MethodNames</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/Faction.html#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in interface com.massivecraft.factions.<a href="../com/massivecraft/factions/Faction.html" title="interface in com.massivecraft.factions">Faction</a></dt>
 <dd>&nbsp;</dd>
-<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#getUpgrade(com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
+<dt><span class="memberNameLink"><a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html#getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">getUpgrade(UpgradeType)</a></span> - Method in class com.massivecraft.factions.zcore.persist.<a href="../com/massivecraft/factions/zcore/persist/MemoryFaction.html" title="class in com.massivecraft.factions.zcore.persist">MemoryFaction</a></dt>
 <dd>&nbsp;</dd>
 <dt><span class="memberNameLink"><a href="../com/massivecraft/factions/cmd/FCommand.html#getUsageTemplate(com.massivecraft.factions.cmd.CommandContext)">getUsageTemplate(CommandContext)</a></span> - Method in class com.massivecraft.factions.cmd.<a href="../com/massivecraft/factions/cmd/FCommand.html" title="class in com.massivecraft.factions.cmd">FCommand</a></dt>
 <dd>&nbsp;</dd>

javadoc/index.html

@@ -218,7 +218,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="rowColor" id="i33">
-<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.fupgrades</a></th>
+<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.fupgrades</a></th>
 <td class="colLast">&nbsp;</td>
 </tr>
 <tr class="altColor" id="i34">

javadoc/overview-frame.html

@@ -28,7 +28,7 @@
 <li><a href="com/massivecraft/factions/zcore/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore</a></li>
 <li><a href="com/massivecraft/factions/zcore/fperms/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.fperms</a></li>
 <li><a href="com/massivecraft/factions/zcore/fperms/gui/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.fperms.gui</a></li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.frame.fupgrades</a></li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.fupgrades</a></li>
 <li><a href="com/massivecraft/factions/zcore/nbtapi/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.nbtapi</a></li>
 <li><a href="com/massivecraft/factions/zcore/nbtapi/utils/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.nbtapi.utils</a></li>
 <li><a href="com/massivecraft/factions/zcore/persist/package-frame.html" target="packageFrame">com.massivecraft.factions.zcore.persist</a></li>

javadoc/overview-tree.html

@@ -113,7 +113,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li><a href="com/massivecraft/factions/zcore/package-tree.html">com.massivecraft.factions.zcore</a>, </li>
 <li><a href="com/massivecraft/factions/zcore/fperms/package-tree.html">com.massivecraft.factions.zcore.fperms</a>, </li>
 <li><a href="com/massivecraft/factions/zcore/fperms/gui/package-tree.html">com.massivecraft.factions.zcore.fperms.gui</a>, </li>
-<li><a href="com/massivecraft/factions/zcore/fupgrades/package-tree.html">com.massivecraft.factions.zcore.frame.fupgrades</a>, </li>
+<li><a href="com/massivecraft/factions/zcore/fupgrades/package-tree.html">com.massivecraft.factions.zcore.fupgrades</a>, </li>
 <li><a href="com/massivecraft/factions/zcore/nbtapi/package-tree.html">com.massivecraft.factions.zcore.nbtapi</a>, </li>
 <li><a href="com/massivecraft/factions/zcore/nbtapi/utils/package-tree.html">com.massivecraft.factions.zcore.nbtapi.utils</a>, </li>
 <li><a href="com/massivecraft/factions/zcore/persist/package-tree.html">com.massivecraft.factions.zcore.persist</a>, </li>
@@ -379,7 +379,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 </ul>
 </li>
 <li class="circle">com.massivecraft.factions.scoreboards.<a href="com/massivecraft/factions/scoreboards/FTeamWrapper.html" title="class in com.massivecraft.factions.scoreboards"><span class="typeNameLink">FTeamWrapper</span></a></li>
-<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
+<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">FUpgradesGUI</span></a> (implements org.bukkit.event.Listener)</li>
 <li class="circle">com.massivecraft.factions.zcore.nbtapi.utils.<a href="com/massivecraft/factions/zcore/nbtapi/utils/GsonWrapper.html" title="class in com.massivecraft.factions.zcore.nbtapi.utils"><span class="typeNameLink">GsonWrapper</span></a></li>
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/InventoryTypeAdapter.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">InventoryTypeAdapter</span></a> (implements com.google.gson.JsonDeserializer&lt;T&gt;, com.google.gson.JsonSerializer&lt;T&gt;)</li>
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/InventoryUtil.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">InventoryUtil</span></a></li>
@@ -493,7 +493,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/EnumTypeAdapter.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">EnumTypeAdapter</span></a>&lt;T&gt;</li>
 </ul>
 </li>
-<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
+<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradesListener</span></a> (implements org.bukkit.event.Listener)</li>
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/UtilFly.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">UtilFly</span></a></li>
 <li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/UUIDFetcher.html" title="class in com.massivecraft.factions.zcore.util"><span class="typeNameLink">UUIDFetcher</span></a> (implements java.util.concurrent.Callable&lt;V&gt;)</li>
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/VisualizeUtil.html" title="class in com.massivecraft.factions.util"><span class="typeNameLink">VisualizeUtil</span></a></li>
@@ -562,7 +562,7 @@ $('.navPadding').css('padding-top', $('.fixedNav').css("height"));
 <li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/TagReplacer.html" title="enum in com.massivecraft.factions.zcore.util"><span class="typeNameLink">TagReplacer</span></a></li>
 <li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/TagReplacer.TagType.html" title="enum in com.massivecraft.factions.zcore.util"><span class="typeNameLink">TagReplacer.TagType</span></a></li>
 <li class="circle">com.massivecraft.factions.zcore.util.<a href="com/massivecraft/factions/zcore/util/TL.html" title="enum in com.massivecraft.factions.zcore.util"><span class="typeNameLink">TL</span></a></li>
-<li class="circle">com.massivecraft.factions.zcore.frame.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
+<li class="circle">com.massivecraft.factions.zcore.fupgrades.<a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/WarmUpUtil.Warmup.html" title="enum in com.massivecraft.factions.util"><span class="typeNameLink">WarmUpUtil.Warmup</span></a></li>
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/XMaterial.html" title="enum in com.massivecraft.factions.util"><span class="typeNameLink">XMaterial</span></a></li>
 <li class="circle">com.massivecraft.factions.util.<a href="com/massivecraft/factions/util/XMaterial.MinecraftVersion.html" title="enum in com.massivecraft.factions.util"><span class="typeNameLink">XMaterial.MinecraftVersion</span></a></li>

javadoc/package-list

@@ -13,7 +13,7 @@ com.massivecraft.factions.util.Particles
 com.massivecraft.factions.zcore
 com.massivecraft.factions.zcore.fperms
 com.massivecraft.factions.zcore.fperms.gui
-com.massivecraft.factions.zcore.frame.fupgrades
+com.massivecraft.factions.zcore.fupgrades
 com.massivecraft.factions.zcore.nbtapi
 com.massivecraft.factions.zcore.nbtapi.utils
 com.massivecraft.factions.zcore.persist

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.massivecraft</groupId>
     <artifactId>Factions</artifactId>
-    <version>1.6.9.5-2.3.3-RC</version>
+    <version>1.6.9.5-2.2.9-RC</version>
     <packaging>jar</packaging>
 
     <name>SaberFactions</name>
@@ -41,14 +41,6 @@
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
-                        <relocation>
-                            <pattern>com.github.stefvanschie.inventoryframework</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.stefvanschie.inventoryframework</shadedPattern>
-                        </relocation>
-                        <relocation>
-                            <pattern>org.bstats</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.org.bstats</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>net.dv8tion</pattern>
                             <shadedPattern>com.massivecraft.factions.shade.net.dv8tion</shadedPattern>
@@ -411,19 +403,9 @@
             <version>2.1</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.bstats</groupId>
-            <artifactId>bstats-bukkit</artifactId>
-            <version>1.7</version>
-            <scope>compile</scope>
-        </dependency>
     </dependencies>
 
     <repositories>
-        <repository>
-            <id>CodeMC</id>
-            <url>https://repo.codemc.org/repository/maven-public</url>
-        </repository>
         <repository>
             <id>central</id>
             <name>bintray</name>

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

@@ -1,6 +1,7 @@
 package com.massivecraft.factions;
 
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.massivecraft.factions.integration.dynmap.DynmapStyle;
 import com.massivecraft.factions.util.XMaterial;
 import com.massivecraft.factions.zcore.fperms.DefaultPermissions;
@@ -21,8 +22,7 @@ public class Conf {
     public static final transient double DYNMAP_STYLE_FILL_OPACITY = 0.35D;
     public static final transient String DYNMAP_STYLE_HOME_MARKER = "greenflag";
     public static final transient boolean DYNMAP_STYLE_BOOST = false;
-    public static List<String> baseCommandAliases = new ArrayList<>();
-    public static String serverTimeZone = "EST";
+    public static List<String> baseCommandAliases = new ArrayList<>(Collections.singletonList("f"));
     public static boolean allowNoSlashCommand = true;
 
     // Colors
@@ -55,8 +55,8 @@ public class Conf {
     public static boolean factionTagForceUpperCase = false;
     public static boolean newFactionsDefaultOpen = false;
     // when faction membership hits this limit, players will no longer be able to join using /f join; default is 0, no limit
-    public static int factionMemberLimit = 30;
-    public static int factionAltMemberLimit = 10;
+    public static int factionMemberLimit = 0;
+    public static int factionAltMemberLimit = 0;
     // what faction ID to start new players in when they first join the server; default is 0, "no faction"
     public static String newPlayerStartingFactionID = "0";
     public static boolean showMapFactionKey = true;
@@ -87,9 +87,7 @@ public class Conf {
     public static int factionBufferSize = 20;
     public static boolean useCheckSystem = true;
     public static boolean spawnerLock = false;
-    public static boolean useGraceSystem = true;
-    public static boolean broadcastGraceToggles = true;
-    public static int gracePeriodTimeDays = 7;
+    public static boolean gracePeriod = false;
     public static boolean noEnderpearlsInFly = false;
     public static boolean broadcastDescriptionChanges = false;
     public static boolean broadcastTagChanges = false;
@@ -101,32 +99,15 @@ public class Conf {
     public static boolean autoLeaveDeleteFPlayerData = true; // Let them just remove player from Faction.
     public static boolean worldGuardChecking = false;
     public static boolean worldGuardBuildPriority = false;
-
-    //FRIENDLY FIRE
-    public static boolean friendlyFireFPlayersCommand = false;
-
-    //Claim Fill
-    public static int maxFillClaimCount = 25;
-    public static int maxFillClaimDistance = 5;
-
     public static boolean factionsDrainEnabled = false;
     //RESERVE
     public static boolean useReserveSystem = true;
     //AUDIT
     public static boolean useAuditSystem = true;
 
-    //INSPECT
-    public static boolean useInspectSystem = true;
-
     //GUI's
     public static boolean useDisbandGUI = true;
 
-    //SEALTH
-    public static boolean useSealthSystem = true;
-
-    //STRIKES
-    public static boolean useStrikeSystem = true;
-
     //DISCORD
     public static boolean useDiscordSystem = false;
     public static String discordBotToken = "<token here>";
@@ -161,6 +142,7 @@ public class Conf {
     public static boolean logPlayerCommands = true;
     // prevent some potential exploits
     public static boolean denyFlightIfInNoClaimingWorld = false;
+    public static boolean preventCreeperGlitch = true;
     public static boolean handleExploitObsidianGenerators = true;
     public static boolean handleExploitEnderPearlClipping = true;
     public static boolean handleExploitInteractionSpam = true;
@@ -277,7 +259,6 @@ public class Conf {
     public static Set<Material> territoryBypassProtectedMaterials = EnumSet.noneOf(Material.class);
     // Dependency check
     public static boolean dependencyCheck = true;
-    public static boolean enableClickToClaim = true;
 
     public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
     public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
@@ -287,7 +268,7 @@ public class Conf {
     public static boolean econEnabled = false;
     public static String econUniverseAccount = "";
     public static double econCostClaimWilderness = 30.0;
-    public static double econCostClaimFromFactionBonus = 0.0;
+    public static double econCostClaimFromFactionBonus = 30.0;
     public static double econOverclaimRewardMultiplier = 0.0;
     public static double econClaimAdditionalMultiplier = 0.5;
     public static double econClaimRefundMultiplier = 0.7;
@@ -430,7 +411,6 @@ public class Conf {
     }
 
     static {
-        baseCommandAliases.add("f");
 
         blacklistedFactionNames.add("somenamehere");
 
@@ -599,9 +579,7 @@ public class Conf {
         FactionsPlugin.getInstance().persist.save(i);
     }
 
-    public static void saveSync() {
-        FactionsPlugin.instance.persist.saveSync(i);
-    }
+    public static void saveSync() { FactionsPlugin.instance.persist.saveSync(i); }
 
     public enum Backend {
         JSON,

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

@@ -14,7 +14,6 @@ import java.util.Set;
 public class FLocation implements Serializable {
     private static final long serialVersionUID = -8292915234027387983L;
     private static final boolean worldBorderSupport;
-
     static {
         boolean worldBorderClassPresent = false;
         try {
@@ -151,9 +150,7 @@ public class FLocation implements Serializable {
         return "" + x + "," + z;
     }
 
-    public String formatXAndZ(String splitter) {
-        return chunkToBlock(this.x) + "x" + splitter + " " + chunkToBlock(this.z) + "z";
-    }
+    public String formatXAndZ(String splitter) { return chunkToBlock(this.x) + "x" + splitter + " " + chunkToBlock(this.z) + "z"; }
 
     //----------------------------------------------//
     // Misc Geometry

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

@@ -12,8 +12,10 @@ import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
 
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -34,70 +36,84 @@ public interface FPlayer extends EconomyParticipator {
     /**
      * Determine if a player has enemies nearby based on the enemy check task in CmdFly
      * NOTE: THIS VALUE IS ONLY UPDATED WHEN A USER IS USING FLY
-     *
      * @return enemiesNearby as a boolean
      */
     boolean hasEnemiesNearby();
 
     /**
      * Set if this FPlayer has an enemy nearby
-     *
      * @param b enemiesNearby
      */
     void setEnemiesNearby(Boolean b);
 
+    /**
+     * Get this players inventory prior to entering the duel (Will be set to null after duel!)
+     * @return Map of old inventory contents
+     */
+    Map<Integer, ItemStack> getOldInv();
+
+    /**
+     * Set this players stored inventory, this inventory will be retrieved after a duel is complete
+     * @param inv Map of inventory contents
+     */
+    void setOldInv(Map<Integer, ItemStack> inv);
+
+    /**
+     * Used to check if player has entered a duel and has not proceeded
+     * @return boolean determining if the player is in a duel
+     */
+    boolean isInDuel();
+
+    /**
+     * Used before and after duels to set the inDuel status of the FPlayer
+     * @param b Desired status
+     */
+    void setInDuel(Boolean b);
+
     /**
      * Get if a player has setup their Discord before
-     *
      * @return if the player setup Discord as a boolean
      */
     boolean discordSetup();
 
     /**
      * Get the players Discord user ID
-     *
      * @return players Discord user ID as a String
      */
     String discordUserID();
 
     /**
      * Set the players Boolean defining if the player has setup their Discord
-     *
      * @param b Boolean for discordSetup to be defined to
      */
     void setDiscordSetup(Boolean b);
 
     /**
      * Set the players Discord user ID
-     *
      * @param s String for their user ID to be set to
      */
     void setDiscordUserID(String s);
 
     /**
      * Get the players Discord user (If the player has not setup Discord it will return null!)
-     *
      * @return User from players set Discord User ID
      */
     User discordUser();
 
     /**
      * Used to check if this player should be served titles
-     *
      * @return if this FPlayer has titles enabled as a boolean
      */
     boolean hasTitlesEnabled();
 
     /**
      * Used to set if player should be served titles
-     *
      * @param b Boolean to titlesEnabled to
      */
     void setTitlesEnabled(Boolean b);
 
     /**
      * Used to determine if a player is in their faction's chest
-     *
      * @return if player is in their faction's as a boolean
      */
     boolean isInFactionsChest();
@@ -288,11 +304,6 @@ public interface FPlayer extends EconomyParticipator {
 
     boolean hasMoney(int amt);
 
-    //Fplayer specific friendly fire.
-    boolean hasFriendlyFire();
-
-    void setFriendlyFire(boolean status);
-
     //inspect Stuff
 
     boolean isInspectMode();
@@ -392,7 +403,6 @@ public interface FPlayer extends EconomyParticipator {
     // Actions
     // -------------------------------
 
-
     void leave(boolean makePay);
 
     boolean canClaimForFaction(Faction forFaction);

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

@@ -11,7 +11,7 @@ import com.massivecraft.factions.util.LazyLocation;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.Permissable;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType;
+import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -23,6 +23,8 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public interface Faction extends EconomyParticipator {
 
+    void broadcast(String s);
+
     String getMemberRoleId();
 
     void setMemberRoleId(String roleId);
@@ -247,8 +249,6 @@ public interface Faction extends EconomyParticipator {
 
     void setHome(Location home);
 
-    void deleteHome();
-
     long getFoundedDate();
 
     void setFoundedDate(long newDate);

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

@@ -12,7 +12,6 @@ import com.massivecraft.factions.cmd.check.CheckTask;
 import com.massivecraft.factions.cmd.check.WeeWooTask;
 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.discord.Discord;
 import com.massivecraft.factions.discord.DiscordListener;
@@ -21,24 +20,24 @@ import com.massivecraft.factions.integration.Worldguard;
 import com.massivecraft.factions.integration.dynmap.EngineDynmap;
 import com.massivecraft.factions.listeners.*;
 import com.massivecraft.factions.missions.MissionHandler;
+import com.massivecraft.factions.shop.ShopConfig;
 import com.massivecraft.factions.struct.ChatMode;
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.*;
-import com.massivecraft.factions.util.adapters.*;
-import com.massivecraft.factions.util.timer.TimerManager;
-import com.massivecraft.factions.util.wait.WaitExecutor;
+import com.massivecraft.factions.util.Particles.ReflectionUtils;
+import com.massivecraft.factions.util.Sync.SyncExecutor;
+import com.massivecraft.factions.util.Wait.WaitExecutor;
 import com.massivecraft.factions.zcore.CommandVisibility;
 import com.massivecraft.factions.zcore.MPlugin;
-import com.massivecraft.factions.zcore.file.impl.FileManager;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.Permissable;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.frame.fupgrades.UpgradesListener;
+import com.massivecraft.factions.zcore.fupgrades.UpgradesListener;
+import com.massivecraft.factions.zcore.util.TextUtil;
 import me.lucko.commodore.CommodoreProvider;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
-import org.bstats.bukkit.Metrics;
 import org.bukkit.*;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
@@ -55,8 +54,10 @@ import java.io.*;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.nio.file.Files;
+import java.nio.file.OpenOption;
 import java.nio.file.Paths;
 import java.util.*;
+import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -83,7 +84,6 @@ public class FactionsPlugin extends MPlugin {
     public boolean mc115 = false;
     public boolean useNonPacketParticles = false;
     public boolean factionsFlight = false;
-    public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
     SkriptAddon skriptAddon;
     private FactionsPlayerListener factionsPlayerListener;
     private boolean locked = false;
@@ -93,11 +93,11 @@ public class FactionsPlugin extends MPlugin {
     private ClipPlaceholderAPIManager clipPlaceholderAPIManager;
     private boolean mvdwPlaceholderAPIManager = false;
     private Listener[] eventsListener;
+    public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
     private Worldguard wg;
     private FLogManager fLogManager;
     private List<ReserveObject> reserveObjects;
-    private FileManager fileManager;
-    private TimerManager timerManager;
+
 
     public FactionsPlugin() {
         instance = this;
@@ -107,10 +107,6 @@ public class FactionsPlugin extends MPlugin {
         return instance;
     }
 
-    public FileManager getFileManager() {
-        return fileManager;
-    }
-
     public boolean getLocked() {
         return this.locked;
     }
@@ -180,10 +176,6 @@ public class FactionsPlugin extends MPlugin {
         migrateFPlayerLeaders();
         log("==== End Setup ====");
 
-        int pluginId = 7013;
-        Metrics metrics = new Metrics(this, pluginId);
-
-
         if (!preEnable()) return;
         this.loadSuccessful = false;
 
@@ -191,24 +183,26 @@ public class FactionsPlugin extends MPlugin {
             this.saveResource("config.yml", false);
             this.reloadConfig();
         }
-
+        //Start synctask
+        SyncExecutor.startTask();
         //Start wait task executor
         WaitExecutor.startTask();
+        //Attempt to generate a permission list
+        PermissionList.generateFile();
         // Load Conf from disk
-        fileManager = new FileManager();
-        getFileManager().setupFiles();
         Conf.load();
         fLogManager = new FLogManager();
         //Dependency checks
         if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault"))) {
             divider();
             System.out.println("You are missing dependencies!");
-            System.out.println("Please verify [Vault] is installed!");
+            System.out.println("Please verify Vault is installed!");
             Conf.save();
             Bukkit.getPluginManager().disablePlugin(instance);
             divider();
             return;
         }
+        //TODO fix this
         //Update their config if needed
         // Updater.updateIfNeeded(getConfig());
         RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
@@ -277,12 +271,9 @@ public class FactionsPlugin extends MPlugin {
         //Setup Discord Bot
         new Discord(this);
 
+        ShopConfig.setup();
         fLogManager.loadLogs(this);
 
-        this.timerManager = new TimerManager(this);
-        this.timerManager.reloadTimerData();
-        System.out.println("[SABER-FACTIONS] - Loaded " + timerManager.getTimers().size() + " timers into list!");
-
         getServer().getPluginManager().registerEvents(factionsPlayerListener = new FactionsPlayerListener(), this);
 
         // Register Event Handlers
@@ -295,7 +286,6 @@ public class FactionsPlugin extends MPlugin {
                 new MissionHandler(this),
                 new FChestListener(),
                 new MenuListener(),
-                timerManager.graceTimer,
                 new AntiChestListener()
         };
 
@@ -324,7 +314,6 @@ public class FactionsPlugin extends MPlugin {
         } catch (Exception e) {
             e.printStackTrace();
         }
-
         if (getDescription().getFullName().contains("BETA")) {
             divider();
             System.out.println("You are using a BETA version of the plugin!");
@@ -437,7 +426,6 @@ public class FactionsPlugin extends MPlugin {
                 .registerTypeAdapter(LazyLocation.class, new MyLocationTypeAdapter())
                 .registerTypeAdapter(mapFLocToStringSetType, new MapFLocToStringSetTypeAdapter())
                 .registerTypeAdapter(Inventory.class, new InventoryTypeAdapter())
-                .registerTypeAdapter(ReserveObject.class, new ReserveAdapter())
                 .registerTypeAdapter(Location.class, new LocationTypeAdapter())
                 .registerTypeAdapterFactory(EnumTypeAdapter.ENUM_FACTORY);
     }
@@ -450,8 +438,6 @@ public class FactionsPlugin extends MPlugin {
 
     @Override
     public void onDisable() {
-        super.onDisable();
-        timerManager.saveTimerData();
         try {
             String path = Paths.get(getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
             File file = new File(path);
@@ -476,6 +462,7 @@ public class FactionsPlugin extends MPlugin {
         if (Discord.jda != null) {
             Discord.jda.shutdownNow();
         }
+        super.onDisable();
         try {
             fLogManager.saveLogs();
         } catch (Exception e) {
@@ -535,6 +522,14 @@ public class FactionsPlugin extends MPlugin {
         return sender instanceof Player && FactionsPlayerListener.preventCommand(commandString, (Player) sender) || super.handleCommand(sender, commandString, testOnly);
     }
 
+    @Override
+    public boolean onCommand(CommandSender sender, Command command, String label, String[] split) {
+        if (split.length == 0) return handleCommand(sender, "/f help", false);
+
+        // otherwise, needs to be handled; presumably another plugin directly ran the command
+        String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
+        return handleCommand(sender, cmd + " " + TextUtil.implode(Arrays.asList(split), " "), false);
+    }
 
     // This method must stay for < 1.12 versions
     @Override
@@ -718,11 +713,13 @@ public class FactionsPlugin extends MPlugin {
     }
 
     public String getPrimaryGroup(OfflinePlayer player) {
-        return perms == null || !perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player);
-    }
+        AtomicReference<String> primaryGroup = new AtomicReference<>();
 
-    public TimerManager getTimerManager() {
-        return timerManager;
+        if (perms == null || !perms.hasGroupSupport()) return " ";
+        else {
+            Bukkit.getScheduler().runTaskAsynchronously(this, () -> primaryGroup.set(perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player)));
+            return primaryGroup.get();
+        }
     }
 
     public void debug(Level level, String s) {

src/main/java/com/massivecraft/factions/cmd/Aliases.java

@@ -6,13 +6,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 
-public class Aliases {
 /**
  * @author DroppingAnvil
  */
-
-    public static ArrayList<String> friendlyFire = new ArrayList<>(Arrays.asList("friendlyfire", "ff"));
-    public static ArrayList<String> notifications = new ArrayList<>(Arrays.asList("notifications", "notis"));
+public class Aliases {
     public static ArrayList<String> alts_alts = new ArrayList<>(Arrays.asList("alts", "alt"));
     public static ArrayList<String> alts_list = new ArrayList<>(Arrays.asList("list", "l"));
     public static ArrayList<String> alts_invite = new ArrayList<>(Collections.singletonList("invite"));
@@ -24,10 +21,8 @@ public class Aliases {
     public static ArrayList<String> claim_auto = new ArrayList<>(Collections.singletonList("autoclaim"));
     public static ArrayList<String> claim_claim = new ArrayList<>(Collections.singletonList("claim"));
     public static ArrayList<String> claim_at = new ArrayList<>(Collections.singletonList("claimat"));
-    public static ArrayList<String> claim_claimFill = new ArrayList<>(Arrays.asList("claimfill", "cf"));
     public static ArrayList<String> claim_line = new ArrayList<>(Arrays.asList("claimline", "cl"));
     public static ArrayList<String> claim_corner = new ArrayList<>(Arrays.asList("corner"));
-    public static ArrayList<String> delfHome = new ArrayList<>(Arrays.asList("delhome", "deletehome"));
     public static ArrayList<String> unclaim_all_safe = new ArrayList<>(Arrays.asList("safeunclaimall", "safedeclaimall"));
     public static ArrayList<String> unclaim_unclaim = new ArrayList<>(Arrays.asList("unclaim", "declaim"));
     public static ArrayList<String> unclaim_all_unsafe = new ArrayList<>(Arrays.asList("unclaimall", "declaimall"));
@@ -41,7 +36,6 @@ public class Aliases {
     public static ArrayList<String> money_withdraw = new ArrayList<>(Arrays.asList("w", "withdraw"));
     public static ArrayList<String> grace = new ArrayList<>(Collections.singletonList("grace"));
     public static ArrayList<String> logout = new ArrayList<>(Collections.singletonList("logout"));
-    public static ArrayList<String> points_balance = new ArrayList<>(Arrays.asList("balance", "bal"));
     public static ArrayList<String> points_points = new ArrayList<>(Collections.singletonList("points"));
     public static ArrayList<String> points_add = new ArrayList<>(Collections.singletonList("add"));
     public static ArrayList<String> points_remove = new ArrayList<>(Collections.singletonList("remove"));

src/main/java/com/massivecraft/factions/cmd/CmdCreate.java

@@ -1,14 +1,12 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
-import com.massivecraft.factions.cmd.reserve.ReserveObject;
 import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.event.FactionCreateEvent;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
-import com.massivecraft.factions.util.Cooldown;
 import com.massivecraft.factions.util.MiscUtil;
 import com.massivecraft.factions.zcore.util.TL;
 import net.dv8tion.jda.core.entities.Member;
@@ -54,17 +52,6 @@ public class CmdCreate extends FCommand {
             return;
         }
 
-        if(Cooldown.isOnCooldown(context.fPlayer.getPlayer(), "createCooldown") && !context.fPlayer.isAdminBypassing()){
-            context.msg(TL.COMMAND_COOLDOWN);
-            return;
-        }
-
-        ReserveObject factionReserve = FactionsPlugin.getInstance().getFactionReserves().stream().filter(factionReserve1 -> factionReserve1.getFactionName().equalsIgnoreCase(tag)).findFirst().orElse(null);
-        if (factionReserve != null && !factionReserve.getName().equalsIgnoreCase(context.player.getName())) {
-            context.msg(TL.COMMAND_CREATE_ALREADY_RESERVED);
-            return;
-        }
-
         ArrayList<String> tagValidationErrors = MiscUtil.validateTag(tag);
         if (tagValidationErrors.size() > 0) {
             context.sendMessage(tagValidationErrors);
@@ -98,9 +85,7 @@ public class CmdCreate extends FCommand {
 
         // finish setting up the Faction
         faction.setTag(tag);
-        if (factionReserve != null) {
-            FactionsPlugin.getInstance().getFactionReserves().remove(factionReserve);
-        }
+
         // trigger the faction join event for the creator
         FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), faction, FPlayerJoinEvent.PlayerJoinReason.CREATE);
         Bukkit.getServer().getPluginManager().callEvent(joinEvent);
@@ -111,7 +96,6 @@ public class CmdCreate extends FCommand {
         // That way we don't have to mess up deleting more stuff.
         // And prevent the user from being returned to NORMAL after deleting his old faction.
         context.fPlayer.setRole(Role.LEADER);
-        Cooldown.setCooldown(context.fPlayer.getPlayer(), "createCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-create"));
         if (FactionsPlugin.getInstance().getConfig().getBoolean("faction-creation-broadcast", true)) {
             for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
                 follower.msg(TL.COMMAND_CREATE_CREATED, context.fPlayer.getName(), faction.getTag(follower));

src/main/java/com/massivecraft/factions/cmd/CmdDelHome.java

@@ -1,51 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.util.TL;
-
-/**
- * Factions - Developed by Driftay.
- * All rights reserved 2020.
- * Creation Date: 3/24/2020
- */
-public class CmdDelHome extends FCommand {
-
-    public CmdDelHome() {
-        this.aliases.addAll(Aliases.delfHome);
-
-        this.requirements = new CommandRequirements.Builder(Permission.DELHOME)
-                .memberOnly()
-                .withAction(PermissableAction.SETHOME)
-                .build();
-    }
-
-
-    @Override
-    public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
-            //Check if homes are enabled
-            if (!Conf.homesEnabled) {
-                context.msg(TL.COMMAND_SETHOME_DISABLED);
-                return;
-            }
-            //If They Don't Have Home
-            if (!context.faction.hasHome()) {
-                context.msg(TL.COMMAND_HOME_NOHOME.toString());
-                context.msg(FactionsPlugin.getInstance().cmdBase.cmdSethome.getUsageTemplate(context));
-                return;
-            }
-
-            context.faction.deleteHome();
-            context.faction.msg(TL.COMMAND_DELHOME_SUCCESS, context.fPlayer.describeTo(context.faction, true));
-
-        });
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_DELHOME_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/CmdDisband.java

@@ -4,12 +4,12 @@ import com.massivecraft.factions.*;
 import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
-import com.massivecraft.factions.util.Cooldown;
+import com.massivecraft.factions.zcore.fdisband.FDisbandFrame;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.frame.fdisband.FDisbandFrame;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
+import org.bukkit.Sound;
 import org.bukkit.command.ConsoleCommandSender;
 
 import java.util.HashMap;
@@ -22,6 +22,8 @@ public class CmdDisband extends FCommand {
      * @author FactionsUUID Team
      */
 
+    //TODO: Add Disband Confirmation GUI
+
     private static HashMap<String, String> disbandMap = new HashMap<>();
 
 
@@ -70,11 +72,6 @@ public class CmdDisband extends FCommand {
             return;
         }
 
-        if(Cooldown.isOnCooldown(context.fPlayer.getPlayer(), "disbandCooldown") && !context.fPlayer.isAdminBypassing()){
-            context.msg(TL.COMMAND_COOLDOWN);
-            return;
-        }
-
 
         boolean access = false;
         if (context.fPlayer.getPlayer().hasMetadata("disband_confirm") && (time = context.fPlayer.getPlayer().getMetadata("disband_confirm").get(0).asLong()) != 0L && System.currentTimeMillis() - time <= TimeUnit.SECONDS.toMillis(3L)) {
@@ -90,6 +87,7 @@ public class CmdDisband extends FCommand {
             }
         }
 
+
         // check for tnt before disbanding.
         if (!disbandMap.containsKey(context.player.getUniqueId().toString()) && faction.getTnt() > 0) {
             context.msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + ""));
@@ -108,17 +106,12 @@ public class CmdDisband extends FCommand {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
                     }
                 }
-                if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
-                    faction.disband(context.player, PlayerDisbandReason.COMMAND);
+                if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
                     context.fPlayer.setFFlying(false, false);
-                    Cooldown.setCooldown(context.fPlayer.getPlayer(), "disbandCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-disband"));
-                    return;
-                }
             } else {
                 context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
             }
             faction.disband(context.player, PlayerDisbandReason.COMMAND);
-            Cooldown.setCooldown(context.fPlayer.getPlayer(), "disbandCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-disband"));
             if (!context.fPlayer.canFlyAtLocation() && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
                 context.fPlayer.setFFlying(false, false);
             }

src/main/java/com/massivecraft/factions/cmd/CmdDiscord.java

@@ -7,9 +7,8 @@ import com.massivecraft.factions.zcore.util.TL;
 import java.util.Random;
 
 /**
- * @author SaberTeam
+ * @author droppinganvil
  */
-
 public class CmdDiscord extends FCommand {
     public CmdDiscord() {
         super();

src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java

@@ -3,9 +3,9 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.util.FactionWarpsFrame;
 import com.massivecraft.factions.util.WarmUpUtil;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.frame.fwarps.FactionWarpsFrame;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;

src/main/java/com/massivecraft/factions/cmd/CmdFly.java

@@ -27,7 +27,6 @@ public class CmdFly extends FCommand {
     public static ConcurrentHashMap<String, Boolean> flyMap = new ConcurrentHashMap<>();
     public static BukkitTask particleTask = null;
     public static BukkitTask flyTask = null;
-    public static boolean autoenable = FactionsPlugin.instance.getConfig().getBoolean("ffly.AutoEnable");
 
 
     public CmdFly() {
@@ -78,27 +77,27 @@ public class CmdFly extends FCommand {
                         continue;
                     }
                     FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
-                    if (fPlayer.isAdminBypassing()) continue;
-                    if (!player.hasPermission("factions.fly.bypassnearbyenemycheck")) {
-                        if (fPlayer.hasEnemiesNearby()) {
-                            disableFlightSync(fPlayer);
+                    Faction myFaction = fPlayer.getFaction();
+                    if (!player.hasPermission("factions.fly.bypassnearbyenemycheck") && !fPlayer.isAdminBypassing()) {
+                        if (fPlayer.hasEnemiesNearby()) disableFlightSync(fPlayer);
+                        checkEnemiesSync(fPlayer);
                         continue;
                     }
-                        checkEnemiesSync(fPlayer);
-                    }
                     FLocation myFloc = new FLocation(player.getLocation());
+                    if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
                         if (!checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
                             disableFlightSync(fPlayer);
                         }
+                    }
 
                 }
             }
 
-        }, 20L, 15L);
+        }, 20L, 20L);
     }
 
     public static boolean checkFly(FPlayer fme, Player me, Faction toFac) {
-        if ((Conf.denyFlightIfInNoClaimingWorld && !Conf.worldsNoClaiming.isEmpty() && Conf.worldsNoClaiming.stream().anyMatch(me.getWorld().getName()::equalsIgnoreCase)) || me.hasPermission(Permission.FLY_FLY.node))
+        if (Conf.denyFlightIfInNoClaimingWorld && !Conf.worldsNoClaiming.isEmpty() && Conf.worldsNoClaiming.stream().anyMatch(me.getWorld().getName()::equalsIgnoreCase))
             return false;
         if (toFac.getAccess(fme, PermissableAction.FLY) == Access.ALLOW) return true;
         if (fme.getFaction().isWilderness()) return false;

src/main/java/com/massivecraft/factions/cmd/CmdFriendlyFire.java

@@ -1,44 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.util.TL;
-
-/**
- * Factions - Developed by Driftay.
- * All rights reserved 2020.
- * Creation Date: 4/6/2020
- */
-public class CmdFriendlyFire extends FCommand {
-
-    public CmdFriendlyFire(){
-        super();
-        this.aliases.addAll(Aliases.friendlyFire);
-
-        this.requirements = new CommandRequirements.Builder(Permission.FRIENDLYFIRE)
-                .playerOnly()
-                .memberOnly()
-                .build();
-    }
-
-    @Override
-    public void perform(CommandContext context) {
-        if(!Conf.friendlyFireFPlayersCommand){
-            context.msg(TL.GENERIC_DISABLED, "friendly fire");
-            return;
-        }
-
-        if(context.fPlayer.hasFriendlyFire()){
-            context.fPlayer.setFriendlyFire(false);
-            context.msg(TL.COMMAND_FRIENDLY_FIRE_TOGGLE_OFF);
-        } else {
-            context.fPlayer.setFriendlyFire(true);
-            context.msg(TL.COMMAND_FRIENDLY_FIRE_TOGGLE_ON);
-        }
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_FRIENDLY_FIRE_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/CmdInspect.java

@@ -1,6 +1,5 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
@@ -22,11 +21,6 @@ public class CmdInspect extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        if (!Conf.useInspectSystem) {
-            context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Inspection");
-            return;
-        }
-
         if (context.fPlayer.isInspectMode()) {
             context.fPlayer.setInspectMode(false);
             context.msg(TL.COMMAND_INSPECT_DISABLED_MSG);

src/main/java/com/massivecraft/factions/cmd/CmdJoin.java

@@ -6,7 +6,7 @@ import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.util.CC;
-import com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType;
+import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
 import com.massivecraft.factions.zcore.util.TL;
 import net.dv8tion.jda.core.entities.Member;
 import net.dv8tion.jda.core.exceptions.HierarchyException;
@@ -56,7 +56,7 @@ public class CmdJoin extends FCommand {
             return;
         }
 
-        if (!faction.altInvited(fplayer) && Conf.factionMemberLimit > 0 && faction.getFPlayers().size() >= getFactionMemberLimit(faction)) {
+        if (Conf.factionMemberLimit > 0 && faction.getFPlayers().size() >= getFactionMemberLimit(faction)) {
             context.msg(TL.COMMAND_JOIN_ATLIMIT, faction.getTag(context.fPlayer), getFactionMemberLimit(faction), fplayer.describeTo(context.fPlayer, false));
             return;
         }
@@ -127,7 +127,6 @@ public class CmdJoin extends FCommand {
         }
 
         faction.deinvite(fplayer);
-
         try {
             context.fPlayer.setRole(faction.getDefaultRole());
             FactionsPlugin.instance.logFactionEvent(faction, FLogType.INVITES, context.fPlayer.getName(), CC.Green + "joined", "the faction");
@@ -155,7 +154,7 @@ public class CmdJoin extends FCommand {
 
     private int getFactionMemberLimit(Faction f) {
         if (f.getUpgrade(UpgradeType.MEMBERS) == 0) return Conf.factionMemberLimit;
-        return Conf.factionMemberLimit + FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Members.Members-Limit.level-" + f.getUpgrade(UpgradeType.MEMBERS));
+        return Conf.factionMemberLimit + FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Members.Member-Boost.level-" + f.getUpgrade(UpgradeType.MEMBERS));
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdLock.java

@@ -22,7 +22,6 @@ public class CmdLock extends FCommand {
         this.optionalArgs.put("on/off", "flip");
 
         this.requirements = new CommandRequirements.Builder(Permission.LOCK)
-                .noDisableOnLock()
                 .build();
     }
 

src/main/java/com/massivecraft/factions/cmd/CmdNotifications.java

@@ -1,38 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.util.TL;
-
-/**
- * Factions - Developed by Driftay.
- * All rights reserved 2020.
- * Creation Date: 4/2/2020
- */
-public class CmdNotifications extends FCommand {
-
-    public CmdNotifications() {
-        super();
-        this.aliases.addAll(Aliases.notifications);
-        this.requirements = new CommandRequirements.Builder(Permission.NOTIFICATIONS)
-                .playerOnly()
-                .memberOnly()
-                .build();
-    }
-
-
-    @Override
-    public void perform(CommandContext context) {
-        if (context.fPlayer.hasNotificationsEnabled()) {
-            context.fPlayer.setNotificationsEnabled(false);
-            context.msg(TL.COMMAND_NOTIFICATIONS_TOGGLED_OFF);
-        } else {
-            context.fPlayer.setNotificationsEnabled(true);
-            context.msg(TL.COMMAND_NOTIFICATIONS_TOGGLED_ON);
-        }
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_NOTIFICATIONS_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/CmdOpen.java

@@ -6,7 +6,6 @@ import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
-import com.massivecraft.factions.util.Cooldown;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOpen extends FCommand {
@@ -39,19 +38,12 @@ public class CmdOpen extends FCommand {
 
             String open = context.faction.getOpen() ? TL.COMMAND_OPEN_OPEN.toString() : TL.COMMAND_OPEN_CLOSED.toString();
 
-            if(Cooldown.isOnCooldown(context.fPlayer.getPlayer(), "openCooldown") && !context.fPlayer.isAdminBypassing()){
-                context.msg(TL.COMMAND_COOLDOWN);
-                return;
-            }
-
             // Inform
             for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
                 if (fplayer.getFactionId().equals(context.faction.getId())) {
                     fplayer.msg(TL.COMMAND_OPEN_CHANGES, context.fPlayer.getName(), open);
-                    Cooldown.setCooldown(fplayer.getPlayer(), "openCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-open"));
                     continue;
                 }
-                if(FactionsPlugin.getInstance().getConfig().getBoolean("faction-open-broadcast")) return;
                 fplayer.msg(TL.COMMAND_OPEN_CHANGED, context.faction.getTag(fplayer.getFaction()), open);
             }
         });

src/main/java/com/massivecraft/factions/cmd/CmdReload.java

@@ -3,7 +3,9 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.discord.Discord;
+import com.massivecraft.factions.duels.RequestGUI;
 import com.massivecraft.factions.listeners.FactionsPlayerListener;
+import com.massivecraft.factions.shop.ShopConfig;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
@@ -25,7 +27,7 @@ public class CmdReload extends FCommand {
         long timeInitStart = System.currentTimeMillis();
         Conf.load();
         Conf.save();
-        FactionsPlugin.getInstance().getFileManager().getShop().loadFile();
+        ShopConfig.loadShop();
         FactionsPlugin.getInstance().reloadConfig();
         FactionsPlugin.getInstance().loadLang();
 
@@ -43,6 +45,9 @@ public class CmdReload extends FCommand {
         FCmdRoot.instance.addVariableCommands();
         FCmdRoot.instance.rebuild();
         long timeReload = (System.currentTimeMillis() - timeInitStart);
+        //Duels
+        RequestGUI.inv = null;
+        RequestGUI.responseMap.clear();
 
         context.msg(TL.COMMAND_RELOAD_TIME, timeReload);
     }

src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java

@@ -1,6 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
+import com.massivecraft.factions.shop.ShopConfig;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
@@ -24,13 +25,12 @@ public class CmdSaveAll extends FCommand {
         Factions.getInstance().forceSave(false);
         Board.getInstance().forceSave(false);
         Conf.save();
-        FactionsPlugin.getInstance().getTimerManager().saveTimerData();
         try {
             FactionsPlugin.instance.getFlogManager().saveLogs();
         } catch (Exception e) {
             e.printStackTrace();
         }
-        FactionsPlugin.getInstance().getFileManager().getShop().saveFile();
+        ShopConfig.saveShop();
         context.msg(TL.COMMAND_SAVEALL_SUCCESS);
     }
 

src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java

@@ -4,7 +4,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.util.ParticleEffect;
+import com.massivecraft.factions.util.Particles.ParticleEffect;
 import com.massivecraft.factions.util.VisualizeUtil;
 import com.massivecraft.factions.util.XMaterial;
 import com.massivecraft.factions.zcore.util.TL;

src/main/java/com/massivecraft/factions/cmd/CmdStealth.java

@@ -1,6 +1,5 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
@@ -20,12 +19,6 @@ public class CmdStealth extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        if (!Conf.useSealthSystem) {
-            context.msg(TL.GENERIC_DISABLED, "Factions Stealth");
-            return;
-        }
-
-
         if (context.faction != null && !context.faction.getId().equalsIgnoreCase("0") && !context.faction.getId().equalsIgnoreCase("none") && !context.faction.getId().equalsIgnoreCase("safezone") && !context.faction.getId().equalsIgnoreCase("warzone")) {
             context.fPlayer.setStealth(!context.fPlayer.isStealthEnabled());
             context.msg(context.fPlayer.isStealthEnabled() ? TL.COMMAND_STEALTH_ENABLE : TL.COMMAND_STEALTH_DISABLE);

src/main/java/com/massivecraft/factions/cmd/CmdStuck.java

@@ -35,12 +35,6 @@ public class CmdStuck extends FCommand {
         final long delay = FactionsPlugin.getInstance().getConfig().getLong("hcf.stuck.delay", 30);
         final int radius = FactionsPlugin.getInstance().getConfig().getInt("hcf.stuck.radius", 10);
 
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("hcf.stuck.Enabled", false)) {
-            context.msg(TL.GENERIC_DISABLED, "Factions Stuck");
-            return;
-        }
-
-
         if (FactionsPlugin.getInstance().getStuckMap().containsKey(player.getUniqueId())) {
             long wait = FactionsPlugin.getInstance().getTimers().get(player.getUniqueId()) - System.currentTimeMillis();
             String time = DurationFormatUtils.formatDuration(wait, TL.COMMAND_STUCK_TIMEFORMAT.toString(), true);

src/main/java/com/massivecraft/factions/cmd/CmdTag.java

@@ -7,7 +7,6 @@ import com.massivecraft.factions.event.FactionRenameEvent;
 import com.massivecraft.factions.scoreboards.FTeamWrapper;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
-import com.massivecraft.factions.util.Cooldown;
 import com.massivecraft.factions.util.MiscUtil;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
@@ -54,11 +53,6 @@ public class CmdTag extends FCommand {
             return;
         }
 
-        if(Cooldown.isOnCooldown(context.player, "tagCooldown") && !context.fPlayer.isAdminBypassing()){
-            context.msg(TL.COMMAND_COOLDOWN);
-            return;
-        }
-
         // trigger the faction rename event (cancellable)
         FactionRenameEvent renameEvent = new FactionRenameEvent(context.fPlayer, tag);
         Bukkit.getServer().getPluginManager().callEvent(renameEvent);
@@ -71,11 +65,8 @@ public class CmdTag extends FCommand {
             return;
         }
 
-
-
         String oldtag = context.faction.getTag();
         context.faction.setTag(tag);
-
         Discord.changeFactionTag(context.faction, oldtag);
         FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.FTAG_EDIT, context.fPlayer.getName(), tag);
 
@@ -84,7 +75,6 @@ public class CmdTag extends FCommand {
         for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
             if (fplayer.getFactionId().equals(context.faction.getId())) {
                 fplayer.msg(TL.COMMAND_TAG_FACTION, context.fPlayer.describeTo(context.faction, true), context.faction.getTag(context.faction));
-                Cooldown.setCooldown(fplayer.getPlayer(), "tagCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-tag"));
                 continue;
             }
             // Broadcast the tag change (if applicable)

src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java

@@ -2,7 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.frame.fupgrades.FUpgradeFrame;
+import com.massivecraft.factions.zcore.fupgrades.FUpgradeFrame;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdUpgrades extends FCommand {

src/main/java/com/massivecraft/factions/cmd/FCmdRoot.java

@@ -8,6 +8,7 @@ import com.massivecraft.factions.cmd.check.CmdCheck;
 import com.massivecraft.factions.cmd.check.CmdWeeWoo;
 import com.massivecraft.factions.cmd.chest.CmdChest;
 import com.massivecraft.factions.cmd.claim.*;
+import com.massivecraft.factions.cmd.configsf.CmdConvertConfig;
 import com.massivecraft.factions.cmd.econ.CmdMoney;
 import com.massivecraft.factions.cmd.grace.CmdGrace;
 import com.massivecraft.factions.cmd.logout.CmdLogout;
@@ -155,6 +156,7 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
     public CmdCheck cmdCheck = new CmdCheck();
     public CmdWeeWoo cmdWeeWoo = new CmdWeeWoo();
     public CmdWild cmdWild = new CmdWild();
+    public CmdConvertConfig cmdConvertConfig = new CmdConvertConfig();
     public CmdSpawnerLock cmdSpawnerLock = new CmdSpawnerLock();
     public CmdSetDiscord cmdSetDiscord = new CmdSetDiscord();
     public CmdSeeDiscord cmdSeeDiscord = new CmdSeeDiscord();
@@ -166,11 +168,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
     public CmdLookup cmdLookup = new CmdLookup();
     public CmdAudit cmdAudit = new CmdAudit();
     public CmdReserve cmdReserve = new CmdReserve();
-    public CmdDelHome cmdDelHome = new CmdDelHome();
-    public CmdClaimFill cmdClaimFill = new CmdClaimFill();
-    public CmdNotifications cmdNotifications = new CmdNotifications();
-    public CmdFriendlyFire cmdFriendlyFire = new CmdFriendlyFire();
-
     //Variables to know if we already setup certain sub commands
     public Boolean discordEnabled = false;
     public Boolean checkEnabled = false;
@@ -187,7 +184,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
     public Boolean internalFTOPEnabled = false;
     public Boolean fWildEnabled = false;
     public Boolean fAuditEnabled = false;
-    public Boolean fStrikes = false;
 
     public FCmdRoot() {
         super();
@@ -216,7 +212,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
         this.addSubCommand(this.cmdCreate);
         this.addSubCommand(this.cmdDeinvite);
         this.addSubCommand(this.cmdDescription);
-        this.addSubCommand(this.cmdDelHome);
         this.addSubCommand(this.cmdDisband);
         this.addSubCommand(this.cmdHelp);
         this.addSubCommand(this.cmdHome);
@@ -267,7 +262,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
         this.addSubCommand(this.cmdDelFWarp);
         this.addSubCommand(this.cmdModifyPower);
         this.addSubCommand(this.cmdLogins);
-        this.addSubCommand(this.cmdClaimFill);
         this.addSubCommand(this.cmdClaimLine);
         this.addSubCommand(this.cmdAHome);
         this.addSubCommand(this.cmdPerm);
@@ -298,13 +292,13 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
         this.addSubCommand(this.cmdChest);
         this.addSubCommand(this.cmdSetBanner);
         this.addSubCommand(this.cmdCorner);
+        this.addSubCommand(this.cmdStrikes);
         this.addSubCommand(this.cmdFGlobal);
         this.addSubCommand(this.cmdViewChest);
+        this.addSubCommand(this.cmdConvertConfig);
         this.addSubCommand(this.cmdSpawnerLock);
         this.addSubCommand(this.cmdDrain);
         this.addSubCommand(this.cmdLookup);
-        this.addSubCommand(this.cmdNotifications);
-        this.addSubCommand(this.cmdFriendlyFire);
         addVariableCommands();
         if (CommodoreProvider.isSupported()) brigadierManager.build();
     }
@@ -361,11 +355,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
             fAuditEnabled = true;
         }
 
-        if (Conf.useStrikeSystem) {
-            this.addSubCommand(this.cmdStrikes);
-            fStrikes = true;
-        }
-
         //Other
         if (FactionsPlugin.getInstance().getConfig().getBoolean("Wild.Enabled", false) && !fWildEnabled) {
             this.addSubCommand(this.cmdWild);
@@ -402,8 +391,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
         if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false) && !fFlyEnabled) {
             this.addSubCommand(this.cmdFly);
             fFlyEnabled = true;
-            CmdFly.startFlyCheck();
-            CmdFly.startParticles();
         }
     }
 

src/main/java/com/massivecraft/factions/cmd/check/CheckHistoryFrame.java

@@ -4,8 +4,8 @@ import com.google.common.collect.Lists;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.util.FactionGUI;
 import com.massivecraft.factions.util.XMaterial;
-import com.massivecraft.factions.zcore.frame.FactionGUI;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.DyeColor;
 import org.bukkit.event.inventory.ClickType;

src/main/java/com/massivecraft/factions/cmd/check/CheckSettingsFrame.java

@@ -3,8 +3,8 @@ package com.massivecraft.factions.cmd.check;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.util.FactionGUI;
 import com.massivecraft.factions.util.XMaterial;
-import com.massivecraft.factions.zcore.frame.FactionGUI;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.ChatColor;
 import org.bukkit.event.inventory.ClickType;

src/main/java/com/massivecraft/factions/cmd/check/CmdWeeWoo.java

@@ -13,7 +13,7 @@ import net.dv8tion.jda.core.entities.TextChannel;
 public class CmdWeeWoo extends FCommand {
 
     /**
-     * @author Vankka
+     * @author Driftay
      */
 
     public CmdWeeWoo() {

src/main/java/com/massivecraft/factions/cmd/claim/CmdClaim.java

@@ -83,6 +83,7 @@ public class CmdClaim extends FCommand {
                         this.stop();
                         return false;
                     }
+
                     return true;
                 }
             };

src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimFill.java

@@ -1,130 +0,0 @@
-package com.massivecraft.factions.cmd.claim;
-
-/**
- * Created by FactionsUUID Team
- */
-
-import com.massivecraft.factions.Board;
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FLocation;
-import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.cmd.Aliases;
-import com.massivecraft.factions.cmd.CommandContext;
-import com.massivecraft.factions.cmd.CommandRequirements;
-import com.massivecraft.factions.cmd.FCommand;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.fperms.Access;
-import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.Location;
-
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.Queue;
-import java.util.Set;
-
-public class CmdClaimFill extends FCommand {
-
-    public CmdClaimFill() {
-
-        // Aliases
-        this.aliases.addAll(Aliases.claim_claimFill);
-
-        // Args
-        this.optionalArgs.put("limit", String.valueOf(Conf.maxFillClaimCount));
-        this.optionalArgs.put("faction", "you");
-
-        this.requirements = new CommandRequirements.Builder(Permission.CLAIM_FILL)
-                .playerOnly()
-                .build();
-    }
-
-    @Override
-    public void perform(CommandContext context) {
-        // Args
-        final int limit = context.argAsInt(0, Conf.maxFillClaimCount);
-
-        if (limit > Conf.maxFillClaimCount) {
-            context.msg(TL.COMMAND_CLAIMFILL_ABOVEMAX, Conf.maxFillClaimCount);
-            return;
-        }
-
-        final Faction forFaction = context.argAsFaction(2, context.faction);
-        Location location = context.player.getLocation();
-        FLocation loc = new FLocation(location);
-
-        Faction currentFaction = Board.getInstance().getFactionAt(loc);
-
-        if (currentFaction.equals(forFaction)) {
-            context.msg(TL.CLAIM_ALREADYOWN, forFaction.describeTo(context.fPlayer, true));
-            return;
-        }
-
-        if (!currentFaction.isWilderness()) {
-            context.msg(TL.COMMAND_CLAIMFILL_ALREADYCLAIMED);
-            return;
-        }
-
-        if (!context.fPlayer.isAdminBypassing() && forFaction.getAccess(context.fPlayer, PermissableAction.TERRITORY) != Access.ALLOW) {
-            context.msg(TL.CLAIM_CANTCLAIM, forFaction.describeTo(context.fPlayer));
-            return;
-        }
-
-        final double distance = Conf.maxFillClaimDistance;
-        long startX = loc.getX();
-        long startZ = loc.getZ();
-
-        Set<FLocation> toClaim = new HashSet<>();
-        Queue<FLocation> queue = new LinkedList<>();
-        FLocation currentHead;
-        queue.add(loc);
-        toClaim.add(loc);
-        while (!queue.isEmpty() && toClaim.size() <= limit) {
-            currentHead = queue.poll();
-
-            if (Math.abs(currentHead.getX() - startX) > distance || Math.abs(currentHead.getZ() - startZ) > distance) {
-                context.msg(TL.COMMAND_CLAIMFILL_TOOFAR, distance);
-                return;
-            }
-
-            addIf(toClaim, queue, currentHead.getRelative(0, 1));
-            addIf(toClaim, queue, currentHead.getRelative(0, -1));
-            addIf(toClaim, queue, currentHead.getRelative(1, 0));
-            addIf(toClaim, queue, currentHead.getRelative(-1, 0));
-        }
-
-        if (toClaim.size() > limit) {
-            context.msg(TL.COMMAND_CLAIMFILL_PASTLIMIT);
-            return;
-        }
-
-        if (toClaim.size() > context.faction.getPowerRounded() - context.faction.getLandRounded()) {
-            context.msg(TL.COMMAND_CLAIMFILL_NOTENOUGHLANDLEFT, forFaction.describeTo(context.fPlayer), toClaim.size());
-            return;
-        }
-
-        final int limFail = Conf.radiusClaimFailureLimit;
-        int fails = 0;
-        for (FLocation currentLocation : toClaim) {
-            if (!context.fPlayer.attemptClaim(forFaction, currentLocation, true)) {
-                fails++;
-            }
-            if (fails >= limFail) {
-                context.msg(TL.COMMAND_CLAIMFILL_TOOMUCHFAIL, fails);
-                return;
-            }
-        }
-    }
-
-    private void addIf(Set<FLocation> toClaim, Queue<FLocation> queue, FLocation examine) {
-        if (Board.getInstance().getFactionAt(examine).isWilderness() && !toClaim.contains(examine)) {
-            toClaim.add(examine);
-            queue.add(examine);
-        }
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_CLAIMFILL_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/configsf/CmdConvertConfig.java

@@ -0,0 +1,29 @@
+package com.massivecraft.factions.cmd.configsf;
+
+import com.massivecraft.factions.cmd.CommandContext;
+import com.massivecraft.factions.cmd.CommandRequirements;
+import com.massivecraft.factions.cmd.FCommand;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.util.TL;
+
+public class CmdConvertConfig extends FCommand {
+
+    public CmdConvertConfig() {
+        super();
+        this.aliases.add("convertconfig");
+
+        this.requirements = new CommandRequirements.Builder(Permission.CONVERTCONFIG)
+                .playerOnly()
+                .build();
+    }
+
+    @Override
+    public void perform(CommandContext context) {
+        ConvertConfigHandler.convertconfig(context.player);
+    }
+
+    @Override
+    public TL getUsageTranslation() {
+        return TL.COMMAND_CONVERTCONFIG_DESCRIPTION;
+    }
+}

src/main/java/com/massivecraft/factions/cmd/configsf/ConvertConfigHandler.java

@@ -0,0 +1,150 @@
+package com.massivecraft.factions.cmd.configsf;
+
+import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitScheduler;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.logging.Level;
+
+/**
+ * @author droppinganvil
+ */
+public class ConvertConfigHandler {
+
+    static File savageConfigFile = new File("plugins/Factions/SavageFactions/config.yml");
+    static FileConfiguration sv = YamlConfiguration.loadConfiguration(savageConfigFile);
+    static File configFile = new File("plugins/Factions/config.yml");
+    static FileConfiguration sb = YamlConfiguration.loadConfiguration(configFile);
+    static JavaPlugin plugin = JavaPlugin.getProvidingPlugin(FactionsPlugin.class);
+
+    public static void setString(String s) {
+        sb.set(s, sv.getString(s));
+    }
+
+    public static void setInt(String s) {
+        sb.set(s, sv.getInt(s));
+    }
+
+    public static void setConfigSec(String s) {
+        ConfigurationSection cs = sv.getConfigurationSection(s);
+        sb.set(s, cs);
+    }
+
+    public static void setBoolean(String s) {
+        sb.set(s, sv.getBoolean(s));
+    }
+
+    public static void convertconfig(Player player) {
+        if (new File("plugins/Factions/SavageFactions/config.yml").exists()) {
+            BukkitScheduler scheduler = plugin.getServer().getScheduler();
+            scheduler.scheduleAsyncDelayedTask(plugin, () -> {
+                File savageConfigFile = new File("plugins/Factions/SavageFactions/config.yml");
+                FileConfiguration sv = YamlConfiguration.loadConfiguration(savageConfigFile);
+                File configFile = new File("plugins/Factions/config.yml");
+                FileConfiguration sb = YamlConfiguration.loadConfiguration(configFile);
+                sb.set("ConfigConvertedFromSavageFactions", true);
+                sb.set("debug", sv.getBoolean("debug"));
+                ConfigurationSection ffe = sv.getConfigurationSection("findfactionsexploit");
+                sb.set("findfactionsexploit", ffe);
+                setString("default-relation");
+                ConfigurationSection pC = sv.getConfigurationSection("portals");
+                sb.set("portals", pC);
+                sb.set("maxwarps", sv.getInt("maxwarps"));
+                setConfigSec("warp-cost");
+                setBoolean("enable-faction-flight");
+                setBoolean("ffly.AutoEnable");
+                setInt("fly-falldamage-cooldown");
+                setBoolean("disable-pistons-in-territory");
+                setConfigSec("tooltips");
+                setConfigSec("scoreboard");
+                sb.set("scoreboard.also-send-chat", true);
+                setConfigSec("warmups");
+                setConfigSec("max-relations");
+                setInt("world-border.buffer");
+                setConfigSec("hcf");
+                sb.set("show", sv.getStringList("show"));
+                setBoolean("show-exempt");
+                sb.set("map", sv.getStringList("map"));
+                setConfigSec("list");
+                setBoolean("use-old-help");
+                setConfigSec("help");
+                setConfigSec("fperm-gui");
+                sb.set("fperm-gui.action.slots.check", 50);
+                setConfigSec("fwarp-gui");
+                setBoolean("faction-creation-broadcast");
+                setBoolean("faction-disband-broadcast");
+                setBoolean("See-Invisible-Faction-Members");
+                setConfigSec("frules");
+                setConfigSec("ftnt");
+                setBoolean("fpaypal.Enabled");
+                setBoolean("checkpoints.Enabled");
+                setConfigSec("fnear");
+                setConfigSec("ffocus");
+                setConfigSec("fvualt");
+                setString("fupgrades.MainMenu.Title");
+                setString("fupgrades.MainMenu.DummyItem.Name");
+                setString("fupgrades.MainMenu.DummyItem.Type");
+                List<String> l = sv.getStringList("fupgrades.MainMenu.DummyItem.Lore");
+                sb.set("fupgrades.MainMenu.DummyItem.Lore", l);
+                setConfigSec("fupgrades.MainMenu.Crops.Crop-Boost");
+                setConfigSec("fupgrades.MainMenu.Crops.Cost");
+                sb.set("fupgrades.MainMenu.Crops.CropItem", sv.getConfigurationSection("fupgrades.MainMenu.Crops.DisplayItem"));
+                setConfigSec("fupgrades.MainMenu.EXP.EXP-Boost");
+                setConfigSec("fupgrades.MainMenu.EXP.Cost");
+                sb.set("fupgrades.MainMenu.EXP.EXPItem", sv.getConfigurationSection("fupgrades.MainMenu.EXP.DisplayItem"));
+                setConfigSec("fupgrades.MainMenu.Power.Power-Boost");
+                setConfigSec("fupgrades.MainMenu.Power.Cost");
+                sb.set("fupgrades.MainMenu.Power.PowerItem", sv.getConfigurationSection("fupgrades.MainMenu.Power.DisplayItem"));
+                List<Integer> p = new ArrayList();
+                p.add(sv.getInt("fupgrades.MainMenu.Power.DisplayItem.Slot"));
+                sb.set("fupgrades.MainMenu.Power.PowerItem.slots", p);
+                sb.set("fupgrades.MainMenu.Power.PowerItem.Amount", 1);
+                sb.set("fupgrades.MainMenu.Power.PowerItem.Damage", 0);
+                sb.set("fupgrades.MainMenu.Power.PowerItem.Slot", null);
+                sb.set("fupgrades.MainMenu.Members.Members-Limit", sv.getConfigurationSection("fupgrades.MainMenu.Members.Members-Boost"));
+                setConfigSec("fupgrades.MainMenu.Spawners.Spawner-Boost");
+                setConfigSec("fupgrades.MainMenu.Spawners.Cost");
+                sb.set("fupgrades.MainMenu.Spawners.SpawnerItem", sv.getConfigurationSection("fupgrades.MainMenu.Spawners.DisplayItem"));
+                setConfigSec("fupgrades.MainMenu.Chest.Chest-Size");
+                setConfigSec("fupgrades.MainMenu.Chest.Cost");
+                sb.set("fupgrades.MainMenu.Chest.ChestItem", sv.getConfigurationSection("fupgrades.MainMenu.Chest.DisplayItem"));
+                setConfigSec("fupgrades.MainMenu.Members.Cost");
+                sb.set("fupgrades.MainMenu.Members.MembersItem", sv.getConfigurationSection("fupgrades.MainMenu.Members.DisplayItem"));
+                sb.set("fupgrades.MainMenu.Members.MembersItem.Amount", 1);
+                sb.set("fupgrades.MainMenu.Members.MembersItem.Damage", 0);
+                if (sv.getString("fupgrades.MainMenu.Members.DisplayItem.Type").equalsIgnoreCase("PLAYER_HEAD"))
+                    sb.set("fupgrades.MainMenu.Members.MembersItem.Type", "PAPER");
+                List<Integer> x = new ArrayList();
+                x.add(sv.getInt("fupgrades.MainMenu.Members.DisplayItem.Slot"));
+                sb.set("fupgrades.MainMenu.Members.MembersItem.slots", x);
+                sb.set("fupgrades.MainMenu.Members.MembersItem.Slot", null);
+                sb.set("fupgrades.MainMenu.Members.Members-Limit", sv.getConfigurationSection("fupgrades.MainMenu.Members.Members-Boost"));
+                setConfigSec("fbanners");
+                setConfigSec("see-chunk");
+                setConfigSec("Tntfill");
+                try {
+                    sb.save(configFile);
+                    plugin.reloadConfig();
+                } catch (IOException e) {
+                    player.sendMessage(TL.COMMAND_CONVERTCONFIG_FAIL.toString());
+                    Bukkit.getLogger().log(Level.SEVERE, Arrays.toString(e.getStackTrace()));
+                }
+                player.sendMessage(TL.COMMAND_CONVERTCONFIG_SUCCESS.toString());
+            }, 0L);
+        } else {
+            player.sendMessage(TL.COMMAND_CONVERTCONFIG_FAILCONFIGMISSING.toString());
+        }
+    }
+
+}

src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyDeposit.java

@@ -36,11 +36,6 @@ public class CmdMoneyDeposit extends FCommand {
     public void perform(CommandContext context) {
         double amount = context.argAsDouble(0, 0d);
         EconomyParticipator faction = context.argAsFaction(1, context.faction);
-
-        if (amount <= 0) {
-            return;
-        }
-
         if (faction == null) {
             return;
         }

src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFf.java

@@ -33,12 +33,6 @@ public class CmdMoneyTransferFf extends FCommand {
     @Override
     public void perform(CommandContext context) {
         double amount = context.argAsDouble(0, 0d);
-
-        if (amount <= 0) {
-            return;
-        }
-
-
         EconomyParticipator from = context.argAsFaction(1);
         if (from == null) {
             return;

src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferFp.java

@@ -32,11 +32,6 @@ public class CmdMoneyTransferFp extends FCommand {
     @Override
     public void perform(CommandContext context) {
         double amount = context.argAsDouble(0, 0d);
-
-        if (amount <= 0) {
-            return;
-        }
-
         EconomyParticipator from = context.argAsFaction(1);
         if (from == null) {
             return;

src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyTransferPf.java

@@ -32,11 +32,6 @@ public class CmdMoneyTransferPf extends FCommand {
     @Override
     public void perform(CommandContext context) {
         double amount = context.argAsDouble(0, 0d);
-
-        if (amount <= 0) {
-            return;
-        }
-
         EconomyParticipator from = context.argAsBestFPlayerMatch(1);
         if (from == null) {
             return;

src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyWithdraw.java

@@ -39,11 +39,6 @@ public class CmdMoneyWithdraw extends FCommand {
     @Override
     public void perform(CommandContext context) {
         double amount = context.argAsDouble(0, 0d);
-
-        if (amount <= 0) {
-            return;
-        }
-
         EconomyParticipator faction = context.argAsFaction(1, context.faction);
         if (faction == null) {
             return;

src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java

@@ -1,73 +1,35 @@
 package com.massivecraft.factions.cmd.grace;
 
 import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.cmd.Aliases;
 import com.massivecraft.factions.cmd.CommandContext;
 import com.massivecraft.factions.cmd.CommandRequirements;
 import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.util.timer.TimerManager;
 import com.massivecraft.factions.zcore.util.TL;
 
-import java.util.concurrent.TimeUnit;
-
 public class CmdGrace extends FCommand {
 
     /**
      * @author Driftay
      */
 
+    //TODO: Make Timed Format For Grace Period
     public CmdGrace() {
         super();
         this.aliases.addAll(Aliases.grace);
 
-        this.optionalArgs.put("on/off", "toggle");
-
         this.requirements = new CommandRequirements.Builder(Permission.GRACE)
                 .build();
     }
 
     @Override
     public void perform(CommandContext context) {
-        if (!Conf.useGraceSystem) {
-            context.msg(TL.GENERIC_DISABLED, "factions grace");
-            return;
+        Conf.gracePeriod = !Conf.gracePeriod;
+        context.msg(TL.COMMAND_GRACE_TOGGLE, Conf.gracePeriod ? FactionsPlugin.getInstance().color("&aEnabled") : FactionsPlugin.getInstance().color("&4Disabled"));
     }
 
-        if(context.args.size() == 1) {
-            if (context.sender.hasPermission(String.valueOf(Permission.GRACETOGGLE))) {
-                if (context.argAsString(0).equalsIgnoreCase("on") || context.argAsString(0).equalsIgnoreCase("start")) {
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setPaused(false);
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setRemaining(TimeUnit.DAYS.toMillis(Conf.gracePeriodTimeDays), true);
-                    if (Conf.broadcastGraceToggles) {
-                        for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers())
-                            follower.msg(TL.COMMAND_GRACE_ENABLED_FORMAT, String.valueOf(TimerManager.getRemaining(FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining(), true)));
-                    }
-                    return;
-                }
-
-                if (context.argAsString(0).equalsIgnoreCase("off") || context.argAsString(0).equalsIgnoreCase("stop")) {
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setRemaining(TimeUnit.SECONDS.toMillis(0L), true);
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setPaused(false);
-                    if (Conf.broadcastGraceToggles) {
-                        for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers())
-                            follower.msg(TL.COMMAND_GRACE_DISABLED_FORMAT);
-                    }
-                    return;
-                }
-            }
-        }
-
-        if(FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining() <= 0L) {
-            context.fPlayer.msg(TL.COMMAND_GRACE_DISABLED_NO_FORMAT.toString());
-        } else {
-            context.fPlayer.msg(TL.COMMAND_GRACE_TIME_REMAINING, String.valueOf(TimerManager.getRemaining(FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining(), true)));
-        }
-
-    }
 
     @Override
     public TL getUsageTranslation() {

src/main/java/com/massivecraft/factions/cmd/points/CmdPoints.java

@@ -17,7 +17,6 @@ public class CmdPoints extends FCommand {
     public CmdPointsRemove cmdPointsRemove = new CmdPointsRemove();
     public CmdPointsSet cmdPointsSet = new CmdPointsSet();
     public CmdPointsAdd cmdPointsAdd = new CmdPointsAdd();
-    public CmdPointsBalance cmdPointsBalance = new CmdPointsBalance();
 
     public CmdPoints() {
         super();
@@ -27,7 +26,7 @@ public class CmdPoints extends FCommand {
                 .playerOnly()
                 .build();
 
-        this.addSubCommand(this.cmdPointsBalance);
+
         this.addSubCommand(this.cmdPointsAdd);
         this.addSubCommand(this.cmdPointsRemove);
         this.addSubCommand(this.cmdPointsSet);

src/main/java/com/massivecraft/factions/cmd/points/CmdPointsBalance.java

@@ -1,56 +0,0 @@
-package com.massivecraft.factions.cmd.points;
-
-import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.cmd.Aliases;
-import com.massivecraft.factions.cmd.CommandContext;
-import com.massivecraft.factions.cmd.CommandRequirements;
-import com.massivecraft.factions.cmd.FCommand;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.util.TL;
-
-/**
- * Factions - Developed by Driftay.
- * All rights reserved 2020.
- * Creation Date: 3/30/2020
- */
-public class CmdPointsBalance extends FCommand {
-
-    public CmdPointsBalance() {
-        super();
-        this.aliases.addAll(Aliases.points_balance);
-
-        this.optionalArgs.put("faction", "yours");
-
-        this.requirements = new CommandRequirements.Builder(Permission.POINTS)
-                .build();
-    }
-
-
-    @Override
-    public void perform(CommandContext context) {
-        Faction faction;
-
-        if (context.argIsSet(0)) {
-            faction = context.argAsFaction(0);
-        } else if (context.faction.isNormal()) {
-            context.msg(TL.COMMAND_POINTS_SHOW_OWN, context.faction.getPoints());
-            return;
-        } else {
-            context.msg(TL.COMMAND_POINTS_SHOW_WILDERNESS);
-            return;
-        }
-
-        if (faction == null) return;
-
-        if (faction != context.faction && !context.fPlayer.isAdminBypassing()) return;
-
-        context.msg(TL.COMMAND_POINTS_SHOW_OTHER.toString().replace("{faction}", faction.getTag()).replace("{points}", faction.getPoints() + ""));
-
-    }
-
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_POINTS_SHOW_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/reserve/ReserveAdapter.java

@@ -11,7 +11,8 @@ public class ReserveAdapter implements JsonSerializer<ReserveObject>, JsonDeseri
 
     public ReserveObject deserialize(JsonElement jsonElement, Type type, JsonDeserializationContext jsonDeserializationContext) throws JsonParseException {
         JsonObject object = jsonElement.getAsJsonObject();
-        return new ReserveObject(object.get("username").getAsString(), object.get("name").getAsString());
+        ReserveObject faction = new ReserveObject(object.get("username").getAsString(), object.get("name").getAsString());
+        return faction;
     }
 
     public JsonElement serialize(ReserveObject data, final Type type, final JsonSerializationContext jsonSerializationContext) {

src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java

@@ -1,6 +1,7 @@
 package com.massivecraft.factions.cmd.tnt;
 
 import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.cmd.Aliases;
 import com.massivecraft.factions.cmd.CommandContext;
@@ -19,8 +20,7 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.*;
 
 public class CmdTntFill extends FCommand {
 
@@ -38,24 +38,6 @@ public class CmdTntFill extends FCommand {
                 .build();
     }
 
-    public static void removeItems(Inventory inventory, ItemStack item, int toRemove) {
-        if (toRemove <= 0 || inventory == null || item == null)
-            return;
-        for (int i = 0; i < inventory.getSize(); i++) {
-            ItemStack loopItem = inventory.getItem(i);
-            if (loopItem == null || !item.isSimilar(loopItem))
-                continue;
-            if (toRemove <= 0)
-                return;
-            if (toRemove < loopItem.getAmount()) {
-                loopItem.setAmount(loopItem.getAmount() - toRemove);
-                return;
-            }
-            inventory.clear(i);
-            toRemove -= loopItem.getAmount();
-        }
-    }
-
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.instance.getConfig().getBoolean("Tntfill.enabled")) {
@@ -164,6 +146,32 @@ public class CmdTntFill extends FCommand {
         }
     }
 
+    public static void removeItems(Inventory inventory, ItemStack item, int toRemove) {
+        if (toRemove <= 0 || inventory == null || item == null)
+            return;
+        for (int i = 0; i < inventory.getSize(); i++) {
+            ItemStack loopItem = inventory.getItem(i);
+            if (loopItem == null || !item.isSimilar(loopItem))
+                continue;
+            if (toRemove <= 0)
+                return;
+            if (toRemove < loopItem.getAmount()) {
+                loopItem.setAmount(loopItem.getAmount() - toRemove);
+                return;
+            }
+            inventory.clear(i);
+            toRemove -= loopItem.getAmount();
+        }
+    }
+
+    // Counts the item type available in the inventory.
+    private int inventoryItemCount(Inventory inventory, Material mat) {
+        int count = 0;
+        HashMap<Integer, ? extends ItemStack> items = inventory.all(mat);
+        for (int item : items.keySet())
+            count += inventory.getItem(item).getAmount();
+        return count;
+    }
 
     public int getAddable(Inventory inv, Material material) {
         int output = 0;

src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java

@@ -10,7 +10,7 @@ import com.massivecraft.factions.cmd.CommandContext;
 import com.massivecraft.factions.cmd.CommandRequirements;
 import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.util.wait.WaitedTask;
+import com.massivecraft.factions.util.Wait.WaitedTask;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -24,6 +24,9 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Random;
 
+/**
+ * @author droppinganvil
+ */
 public class CmdWild extends FCommand implements WaitedTask {
     public static HashMap<Player, String> teleportRange;
     public static HashSet<Player> teleporting;
@@ -38,6 +41,7 @@ public class CmdWild extends FCommand implements WaitedTask {
                 .build();
         teleporting = new HashSet<>();
         teleportRange = new HashMap<>();
+        startWild();
     }
 
     @Override
@@ -49,6 +53,8 @@ public class CmdWild extends FCommand implements WaitedTask {
         }
     }
 
+    public void startWild() {
+    }
 
     public void attemptTeleport(Player p) {
         boolean success = false;
@@ -112,5 +118,4 @@ public class CmdWild extends FCommand implements WaitedTask {
     public void handleFailure(Player player) {
         player.sendMessage(TL.COMMAND_WILD_INTERUPTED.toString());
     }
-
 }

src/main/java/com/massivecraft/factions/cmd/wild/WildGUI.java

@@ -2,10 +2,10 @@ package com.massivecraft.factions.cmd.wild;
 
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.util.FactionGUI;
+import com.massivecraft.factions.util.Wait.WaitExecutor;
+import com.massivecraft.factions.util.Wait.WaitTask;
 import com.massivecraft.factions.util.XMaterial;
-import com.massivecraft.factions.util.wait.WaitExecutor;
-import com.massivecraft.factions.util.wait.WaitTask;
-import com.massivecraft.factions.zcore.frame.FactionGUI;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
@@ -20,6 +20,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Objects;
 
+/**
+ * @author droppinganvil
+ */
+//TODO StaticGUI
 public class WildGUI implements FactionGUI {
     Player player;
     FPlayer fplayer;

src/main/java/com/massivecraft/factions/discord/CmdInviteBot.java

@@ -11,7 +11,7 @@ import net.dv8tion.jda.core.Permission;
 public class CmdInviteBot extends FCommand {
 
     /**
-     * @author Vankka
+     * @author Driftay
      */
 
     public CmdInviteBot(){

src/main/java/com/massivecraft/factions/discord/CmdSetGuild.java

@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
 public class CmdSetGuild extends FCommand {
 
     /**
-     * @author Vankka
+     * @author Driftay
      */
 
     private EventWaiter eventWaiter;

src/main/java/com/massivecraft/factions/discord/Discord.java

@@ -4,6 +4,7 @@ import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.util.exceptions.SaberException;
 import net.dv8tion.jda.core.AccountType;
 import net.dv8tion.jda.core.JDA;
 import net.dv8tion.jda.core.JDABuilder;
@@ -19,15 +20,15 @@ import java.util.Objects;
 import java.util.logging.Level;
 
 /**
- * @author SaberTeam
+ * @author droppinganvil
  */
-
 public class Discord {
     //We dont want waitingLink to reset during reload so we are going to set it here
     public static HashMap<Integer, FPlayer> waitingLink;
     public static HashMap<FPlayer, Integer> waitingLinkk;
     //We want to track the amount of times setup has been tried and the result may be useful for determining issues
     public static HashSet<DiscordSetupAttempt> setupLog;
+    private static FactionsPlugin plugin;
     public static Boolean confUseDiscord;
     public static String botToken;
     public static String mainGuildID;
@@ -39,7 +40,6 @@ public class Discord {
     public static Boolean useEmotes;
     public static Emote positive;
     public static Emote negative;
-    private static FactionsPlugin plugin;
 
     public Discord(FactionsPlugin plugin) {
         Discord.plugin = plugin;
@@ -65,9 +65,7 @@ public class Discord {
     }
 
     private static Boolean startBot() {
-        if (!Conf.useDiscordSystem) {
-            return false;
-        }
+        if (!Conf.useDiscordSystem) {return false;}
         try {
             jda = new JDABuilder(AccountType.BOT).setToken(Conf.discordBotToken).buildBlocking();
         } catch (LoginException | InterruptedException e) {
@@ -95,22 +93,13 @@ public class Discord {
                 try {
                     positive = jda.getEmoteById(Conf.positiveReaction);
                     negative = jda.getEmoteById(Conf.negativeReaction);
-                    if (positive == null | negative == null) {
-                        useEmotes = false;
-                    }
+                    if (positive == null | negative == null) {useEmotes = false;}
                 } catch (NumberFormatException e) {
                     FactionsPlugin.getInstance().getLogger().log(Level.WARNING, "Invalid Emote(s) disabling them.");
                     useEmotes = false;
                 }
-                if (mainGuild != null) {
-                    leader = mainGuild.getRoleById(Conf.leaderRole);
-                } else {
-                    leader = null;
-                }
-            } else {
-                useEmotes = false;
-                leader = null;
-            }
+                if (mainGuild != null) {leader = mainGuild.getRoleById(Conf.leaderRole);} else {leader = null;}
+            } else {useEmotes = false; leader = null;}
         } catch (NullPointerException e) {
             setupLog.add(new DiscordSetupAttempt("Threw an NPE while setting up variables", System.currentTimeMillis()));
         }
@@ -125,21 +114,11 @@ public class Discord {
     public static String getNicknameString(FPlayer f) {
         if (useDiscord) {
             String temp = Conf.factionTag;
-            if (temp.contains("NAME")) {
-                temp = temp.replace("NAME", f.getName());
-            }
-            if (temp.contains("DiscordName")) {
-                temp = temp.replace("DiscordName", (f.discordUser() == null) ? (f.getName()) : (f.discordUser().getName()));
-            }
-            if (temp.contains("FACTION")) {
-                temp = temp.replace("FACTION", f.getFaction().getTag());
-            }
-            if (temp.contains("FactionRole")) {
-                temp = temp.replace("FactionRole", f.getRole().getRoleCapitalized());
-            }
-            if (temp.contains("FactionRolePrefix")) {
-                temp = temp.replace("FactionRolePrefix", f.getRole().getPrefix());
-            }
+            if (temp.contains("NAME")) { temp = temp.replace("NAME", f.getName()); }
+            if (temp.contains("DiscordName")) { temp = temp.replace("DiscordName", (f.discordUser() == null) ? (f.getName()) : (f.discordUser().getName())); }
+            if (temp.contains("FACTION")) { temp = temp.replace("FACTION", f.getFaction().getTag()); }
+            if (temp.contains("FactionRole")) { temp = temp.replace("FactionRole", f.getRole().getRoleCapitalized()); }
+            if (temp.contains("FactionRolePrefix")) { temp = temp.replace("FactionRolePrefix", f.getRole().getPrefix()); }
             return temp;
         }
         return null;
@@ -162,9 +141,7 @@ public class Discord {
     public static Role getRoleFromName(String s) {
         if (useDiscord && mainGuild != null) {
             for (Role r : mainGuild.getRoles()) {
-                if (r.getName().equals(s)) {
-                    return r;
-                }
+                if (r.getName().equals(s)) {return r;}
             }
         }
         return null;
@@ -177,12 +154,8 @@ public class Discord {
      * @return Role generated faction role
      */
     public static Role createFactionRole(String s) {
-        if (!useDiscord) {
-            return null;
-        }
-        if (mainGuild == null) {
-            return null;
-        }
+        if (!useDiscord) { return null; }
+        if (mainGuild == null) { return null; }
         StringBuilder sb = new StringBuilder();
         sb.append(Conf.factionRolePrefix);
         sb.append(s);
@@ -206,7 +179,6 @@ public class Discord {
 
     /**
      * Get the name of the Faction Role that would be generated with the tag
-     *
      * @param tag Faction Name/Tag
      * @return Name of would be Role
      */
@@ -235,19 +207,13 @@ public class Discord {
      * @param f FPlayer target
      */
     public static void resetNick(FPlayer f) {
-        if (mainGuild == null) {
-            return;
-        }
-        if (mainGuild.getMember(f.discordUser()) == null) {
-            return;
-        }
+        if (mainGuild == null) { return; }
+        if (mainGuild.getMember(f.discordUser()) == null) { return; }
         mainGuild.getController().setNickname(mainGuild.getMember(f.discordUser()), f.discordUser().getName()).queue();
     }
 
     public static void changeFactionTag(Faction f, String oldTag) {
-        if (!useDiscord | mainGuild == null) {
-            return;
-        }
+        if (!useDiscord | mainGuild == null) { return; }
         for (FPlayer fp : f.getFPlayers()) {
             if (fp.discordSetup() && isInMainGuild(fp.discordUser())) {
                 try {
@@ -259,9 +225,7 @@ public class Discord {
                         mainGuild.getController().removeSingleRoleFromMember(m, Objects.requireNonNull(getRoleFromName(oldTag))).queue();
                         mainGuild.getController().addSingleRoleToMember(m, Objects.requireNonNull(createFactionRole(f.getTag()))).queue();
                     }
-                } catch (HierarchyException e) {
-                    System.out.print(e.getMessage());
-                }
+                } catch (HierarchyException e) {System.out.print(e.getMessage());}
             }
         }
 

src/main/java/com/massivecraft/factions/discord/DiscordListener.java

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 public class DiscordListener extends ListenerAdapter {
 
     /**
-     * @author Vankka
+     * @author Driftay
      */
 
     private static File file = new File(FactionsPlugin.getInstance().getDataFolder(), "discord_guilds.json");
@@ -93,8 +93,7 @@ public class DiscordListener extends ListenerAdapter {
                 prefix = ".";
             }
             String content = event.getMessage().getContentRaw();
-            if (!content.startsWith(prefix) && !content.startsWith(event.getGuild().getSelfMember().getAsMention()))
-                return;
+            if (!content.startsWith(prefix) && !content.startsWith(event.getGuild().getSelfMember().getAsMention())) return;
             if (content.startsWith(prefix + "help") || content.startsWith(event.getGuild().getSelfMember().getAsMention() + " help")) {
                 this.help(event, content, prefix);
             } else if (content.startsWith(prefix + "stats")) {
@@ -125,8 +124,7 @@ public class DiscordListener extends ListenerAdapter {
                 this.settings(event);
             }
         } catch (PermissionException exception) {
-            if (!event.getGuild().getSelfMember().hasPermission(event.getChannel(), Permission.MESSAGE_READ, Permission.MESSAGE_WRITE))
-                return;
+            if (!event.getGuild().getSelfMember().hasPermission(event.getChannel(), Permission.MESSAGE_READ, Permission.MESSAGE_WRITE)) return;
             event.getChannel().sendMessage((":x: Missing permission, `" + exception.getPermission().toString() + "`")).queue();
         }
     }
@@ -137,8 +135,7 @@ public class DiscordListener extends ListenerAdapter {
 
     private Faction getFactionWithWarning(TextChannel textChannel) {
         Faction faction = this.getFaction(textChannel.getGuild());
-        if (faction == null)
-            textChannel.sendMessage((":x: This guild isn't linked to a faction, use `/f setguild " + textChannel.getGuild().getId() + "` in game")).queue();
+        if (faction == null) textChannel.sendMessage((":x: This guild isn't linked to a faction, use `/f setguild " + textChannel.getGuild().getId() + "` in game")).queue();
         return faction;
     }
 

src/main/java/com/massivecraft/factions/discord/DiscordSetupAttempt.java

@@ -1,10 +1,8 @@
 package com.massivecraft.factions.discord;
 
-
 /**
- * @author SaberTeam
+ * @author droppinganvil
  */
-
 public class DiscordSetupAttempt {
     private Boolean success;
     private String reason;
@@ -12,7 +10,6 @@ public class DiscordSetupAttempt {
 
     /**
      * Constructor used when an attempt fails
-     *
      * @param reason String reason for the attempt failing
      * @param time Long current system time in millis
      */
@@ -24,7 +21,6 @@ public class DiscordSetupAttempt {
 
     /**
      * Constructor used for successful attempts
-     *
      * @param time Long Current system time in millis
      */
     public DiscordSetupAttempt(Long time) {
@@ -35,43 +31,30 @@ public class DiscordSetupAttempt {
 
     /**
      * Get if this attempt to setup the Discord bot was successful
-     *
      * @return Boolean success
      */
-    public Boolean getSuccess() {
-        return this.success;
-    }
+    public Boolean getSuccess() {return this.success;}
 
     /**
      * Get the reason for the setup failing (If it was successful it will return null)
-     *
      * @return String reason
      */
-    public String getReason() {
-        return this.reason;
-    }
+    public String getReason() {return this.reason;}
 
     /**
      * Get the time this setup was attempted
-     *
      * @return Long initialTime
      */
-    public Long getInitialTime() {
-        return this.initialTime;
-    }
+    public Long getInitialTime() {return this.initialTime;}
 
     /**
      * Get the difference of time between when attempted and present time
-     *
      * @return Long time difference in milliseconds
      */
-    public Long getDifferentialTime() {
-        return System.currentTimeMillis() - initialTime;
-    }
+    public Long getDifferentialTime() {return System.currentTimeMillis()-initialTime;}
 
     /**
      * Get the difference in time between when attempted and present time formatted MS,Seconds,Minutes,Hours,Years
-     *
      * @return String with formatted time difference
      */
     public String getDifferentialFormatted() {
@@ -111,24 +94,12 @@ public class DiscordSetupAttempt {
         sb.append(" ");
         String s = "";
         switch (timeIndex) {
-            case 0:
-                s = "MS";
-                break;
-            case 1:
-                s = "Seconds";
-                break;
-            case 2:
-                s = "Minutes";
-                break;
-            case 3:
-                s = "Hours";
-                break;
-            case 4:
-                s = "Days";
-                break;
-            case 5:
-                s = "Years";
-                break;
+            case 0: s = "MS"; break;
+            case 1: s = "Seconds"; break;
+            case 2: s = "Minutes"; break;
+            case 3: s = "Hours"; break;
+            case 4: s = "Days"; break;
+            case 5: s = "Years"; break;
         }
         sb.append(s);
         sb.append(" ago");

src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java

@@ -5,6 +5,8 @@ import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.FactionsPlugin;
 import mkremins.fanciful.FancyMessage;
+import net.dv8tion.jda.core.AccountType;
+import net.dv8tion.jda.core.JDABuilder;
 import net.dv8tion.jda.core.Permission;
 import net.dv8tion.jda.core.entities.Message;
 import net.dv8tion.jda.core.entities.TextChannel;
@@ -17,15 +19,12 @@ import net.dv8tion.jda.webhook.WebhookMessage;
 import net.dv8tion.jda.webhook.WebhookMessageBuilder;
 import org.bukkit.ChatColor;
 
+import javax.security.auth.login.LoginException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
-
-
-/**
- * @author Vankka & SaberTeam
- */
+import java.util.logging.Level;
 
 public class FactionChatHandler extends ListenerAdapter {
 
@@ -70,9 +69,7 @@ public class FactionChatHandler extends ListenerAdapter {
                     while (i <= x.size() - 1) {
                         mention.append(" ").append(x.get(i));
                         ii.add(i);
-                        if (mention.toString().contains("#")) {
-                            break;
-                        }
+                        if (mention.toString().contains("#")) {break;}
                         i++;
                     }
                     if (mention.toString().contains("#")) {

src/main/java/com/massivecraft/factions/duels/Duel.java

@@ -0,0 +1,166 @@
+package com.massivecraft.factions.duels;
+
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.FactionsPlugin;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.entity.Player;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.inventory.ItemStack;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author droppinganvil
+ */
+public class Duel {
+    private Faction faction1;
+    private Faction faction2;
+    private HashMap<FPlayer, Boolean> eliminationMap;
+    private HashMap<FPlayer, Location> oldLocMap;
+
+    public Duel(Faction faction1, Faction faction2) {
+        this.faction1 = faction1;
+        this.faction2 = faction2;
+        this.eliminationMap = new HashMap<>();
+        this.oldLocMap = new HashMap<>();
+    }
+
+    public Faction getFaction1() {
+        return faction1;
+    }
+
+    public Faction getFaction2() {
+        return faction2;
+    }
+
+    public Set<FPlayer> getEliminated() {
+        Set<FPlayer> list = new HashSet<>();
+        for (Map.Entry<FPlayer, Boolean> entry : eliminationMap.entrySet()) {
+            if (entry.getValue()) list.add(entry.getKey());
+        }
+        return list;
+    }
+
+    public Set<FPlayer> getEliminated(Faction faction) {
+        Set<FPlayer> list = new HashSet<>();
+        for (Map.Entry<FPlayer, Boolean> entry : eliminationMap.entrySet()) {
+            if (entry.getValue() && entry.getKey().getFaction().equals(faction)) list.add(entry.getKey());
+        }
+        return list;
+    }
+
+    public Set<FPlayer> getRemaining() {
+        Set<FPlayer> list = new HashSet<>();
+        for (Map.Entry<FPlayer, Boolean> entry : eliminationMap.entrySet()) {
+            if (!entry.getValue()) list.add(entry.getKey());
+        }
+        return list;
+    }
+
+    public Set<FPlayer> getRemaining(Faction faction) {
+        Set<FPlayer> list = new HashSet<>();
+        for (Map.Entry<FPlayer, Boolean> entry : eliminationMap.entrySet()) {
+            if (!entry.getValue() && entry.getKey().getFaction().equals(faction)) list.add(entry.getKey());
+        }
+        return list;
+    }
+
+    public void handleExit(FPlayer fplayer, Boolean death) {
+        if (death) {
+            eliminationMap.replace(fplayer, false, true);
+            fplayer.getPlayer().spigot().respawn();
+        }
+        fplayer.getPlayer().teleport(oldLocMap.get(fplayer), PlayerTeleportEvent.TeleportCause.PLUGIN);
+        for (Map.Entry<Integer, ItemStack> entry : fplayer.getOldInv().entrySet()) {
+            fplayer.getPlayer().getInventory().setItem(entry.getKey(), entry.getValue());
+        }
+        fplayer.setOldInv(null);
+        fplayer.setInDuel(false);
+        if (getClearWinner() != null) {
+            handleEnd();
+        }
+    }
+
+    public void handleEnd() {
+        if (FactionsPlugin.getInstance().getConfig().getBoolean("Duels.Broadcast.BroadcastResult.Enabled")) {
+            Bukkit.broadcastMessage(getEndMessage());
+        }
+        for (FPlayer fp : getRemaining()) {
+            handleExit(fp, false);
+        }
+        Map.Entry<Faction, Faction> fvf = (Map.Entry<Faction, Faction>) Duels.duelQueue.entrySet().toArray()[0];
+        if (fvf != null) {
+            Duels.duel = new Duel(fvf.getKey(), fvf.getValue());
+            Duels.preparingDuel = true;
+            Duels.acceptedDuel.clear();
+            Duels.sendRequests(faction1);
+            Duels.sendRequests(faction2);
+        }
+    }
+
+    public Faction getClearWinner() {
+        Set<FPlayer> team1r = getRemaining(faction1);
+        Set<FPlayer> team2r = getRemaining(faction2);
+        if (team1r.isEmpty() && !team2r.isEmpty()) return faction2;
+        if (team2r.isEmpty() && !team1r.isEmpty()) return faction1;
+        return null;
+    }
+
+    private Faction getWinning(Set<FPlayer> s1, Set<FPlayer> s2) {
+        if (s1.size() > s2.size()) return faction1;
+        return faction2;
+    }
+
+    public String getEndMessage() {
+        String temp;
+        Set<FPlayer> team1r = getRemaining(faction1);
+        Set<FPlayer> team2r = getRemaining(faction2);
+        if (team1r.size() == team2r.size()) {
+            //Tied
+            temp = FactionsPlugin.getInstance().getConfig().getString("Duels.Broadcast.BroadcastResult.FormatTie");
+        } else {
+            temp = FactionsPlugin.getInstance().getConfig().getString("Duels.Broadcast.BroadcastResult.Format");
+        }
+        Faction winner = getWinning(team1r, team2r);
+        return ChatColor.translateAlternateColorCodes('&', temp
+                .replace("{team1_tag}", faction1.getTag())
+                .replace("{team2_tag}", faction2.getTag())
+                .replace("{remaining}", String.valueOf(getRemaining(winner).size()))
+                .replace("{tag}", winner.getTag())
+                .replace("{losers_tag}", winner == faction1 ? faction2.getTag() : faction1.getTag()));
+    }
+
+    public String getDeathMessage(Player player) {
+        return ChatColor.translateAlternateColorCodes('&',
+                FactionsPlugin.getInstance().getConfig().getString("Duels.Broadcast.BroadcastKill.Format")
+                .replace("{team1_remaining}", String.valueOf(getRemaining(getFaction1()).size()))
+                .replace("{team2_remaining}", String.valueOf(getRemaining(getFaction2()).size()))
+                .replace("{team1_eliminated}", String.valueOf(getEliminated(getFaction1()).size()))
+                .replace("{team2_eliminated}", String.valueOf(getEliminated(getFaction2()).size()))
+                .replace("{team1_tag}", faction1.getTag())
+                .replace("{team2_tag}", faction2.getTag())
+                .replace("{eliminated_name}", player.getName()));
+    }
+
+    public HashMap<FPlayer, Location> getLocMap() {
+        return oldLocMap;
+    }
+
+    public void addFPlayer(FPlayer fp) {
+        oldLocMap.put(fp, fp.getPlayer().getLocation());
+        eliminationMap.put(fp, false);
+    }
+
+    public void start() {
+        Duels.preparingDuel = false;
+        for (FPlayer fplayer : Duels.acceptedDuel) {
+
+        }
+    }
+}

src/main/java/com/massivecraft/factions/duels/Duels.java

@@ -0,0 +1,73 @@
+package com.massivecraft.factions.duels;
+
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.FactionsPlugin;
+import org.bukkit.Bukkit;
+import org.bukkit.Location;
+import org.bukkit.configuration.file.FileConfiguration;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * @author droppinganvil
+ */
+public class Duels {
+    public static boolean enabled = true;
+    public static long targetTimeout = Integer.toUnsignedLong(FactionsPlugin.getInstance().getConfig().getInt("Duels.WaitTime")) * 1000;
+    public static ConcurrentHashMap<FPlayer, Long> guiMap = new ConcurrentHashMap<>();
+    public static HashSet<FPlayer> acceptedDuel = new HashSet<>();
+    public static HashMap<Faction, Faction> duelQueue = new HashMap<>();
+    public static Boolean preparingDuel = false;
+    public static Duel duel;
+    public static HashSet<SpawnPoint> spawnPoints = new HashSet<>();
+
+    private static void startGUITask() {
+        Bukkit.getScheduler().scheduleAsyncRepeatingTask(FactionsPlugin.instance, () -> {
+            for (Map.Entry<FPlayer, Long> entry : guiMap.entrySet()) {
+                if (System.currentTimeMillis() - entry.getValue() <= targetTimeout) RequestGUI.closeSync(true, entry.getKey());
+            }
+        }, 0L, 20L);
+    }
+
+    public void setup() {
+        enabled = FactionsPlugin.getInstance().getConfig().getBoolean("Duels.Enabled", true);
+        if (enabled) startGUITask();
+        loadSpawnPoints();
+
+    }
+
+    public void loadSpawnPoints() {
+        spawnPoints.clear();
+        loadTeamSpawnPoints(1);
+        loadTeamSpawnPoints(2);
+    }
+
+    public void loadTeamSpawnPoints(Integer i) {
+        FileConfiguration config = FactionsPlugin.getInstance().getConfig();
+        String team = "Team" + i;
+        for (String key : config.getConfigurationSection("Duels.SpawnPoints." + team).getKeys(false)) {
+            spawnPoints.add(new SpawnPoint (i, getSpawnPointLocation(team, key, config), Integer.parseInt(key)));
+        }
+
+    }
+
+    public Location getSpawnPointLocation(String team, String key, FileConfiguration config) {
+        String[] locKeyArray = config.getString("Duels.SpawnPoints." + team + "." + key).split(",");
+        return new Location(Bukkit.getWorld(locKeyArray[0]), Double.parseDouble(locKeyArray[1]), Double.parseDouble(locKeyArray[2]), Double.parseDouble(locKeyArray[3]));
+    }
+
+    public static void sendRequests(Faction faction) {
+        for (FPlayer fplayer : faction.getFPlayers()) {
+            if (fplayer.isOnline()) {
+                fplayer.getPlayer().openInventory(RequestGUI.inv);
+                guiMap.put(fplayer, System.currentTimeMillis());
+            }
+        }
+    }
+
+
+}

src/main/java/com/massivecraft/factions/duels/RequestGUI.java

@@ -0,0 +1,121 @@
+package com.massivecraft.factions.duels;
+
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.FPlayers;
+import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.util.StaticGUI;
+import com.massivecraft.factions.util.Sync.SyncExecutor;
+import com.massivecraft.factions.util.Sync.SyncTask;
+import com.massivecraft.factions.util.XMaterial;
+import com.massivecraft.factions.zcore.util.TL;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.file.FileConfiguration;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.Inventory;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.logging.Level;
+
+/**
+ * @author droppinganvil
+ */
+public class RequestGUI implements StaticGUI {
+    private static ItemStack fillItem;
+    private static RequestResponse fallback;
+    FileConfiguration config = FactionsPlugin.getInstance().getConfig();
+    public static HashMap<Integer, RequestResponse> responseMap = new HashMap<>();
+    public static Inventory inv;
+    private static RequestGUI instance;
+    public static RequestGUI getInstance() {
+        return instance;
+    }
+
+    public RequestGUI() {
+        if (instance == null) {
+            instance = this;
+        }
+        if (fillItem == null) {
+            fillItem = XMaterial.matchXMaterial(config.getString("Duels.GUI.Fill-Item.Material")).get().parseItem();
+            ItemMeta fillMeta = fillItem.getItemMeta();
+            fillMeta.setDisplayName(" ");
+            fillItem.setItemMeta(fillMeta);
+        }
+        if (fallback == null) {
+            try {
+                fallback = RequestResponse.valueOf(config.getString("Duels.GUI.Fill-Item.Response"));
+            } catch (EnumConstantNotPresentException e) {
+                FactionsPlugin.getInstance().getLogger().log(Level.WARNING, "FallbackResponse is invalid! Using Ignored");
+                fallback = RequestResponse.Ignored;
+            }
+        }
+        if (inv == null) {
+            inv = Bukkit.createInventory(this, 27, "Join Faction Duel");
+            int fi = 0;
+            while (fi != 26) {
+                inv.setItem(fi, fillItem);
+                fi++;
+            }
+            for (String key : config.getConfigurationSection("Duels.GUI.Items").getKeys(false)) {
+                ItemStack item = XMaterial.matchXMaterial(config.getString("Duels.GUI.Items." + key + ".Material")).get().parseItem();
+                ItemMeta itemMeta = item.getItemMeta();
+                itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', config.getString("Duels.GUI.Items." + key + ".Name")));
+                List<String> lore = new ArrayList<>();
+                for (String loreEntry : config.getStringList("Duels.GUI.Items." + key + ".Lore")) {
+                    lore.add(ChatColor.translateAlternateColorCodes('&', loreEntry));
+                }
+                itemMeta.setLore(lore);
+                item.setItemMeta(itemMeta);
+                int slot = Integer.parseInt(key);
+                responseMap.put(slot, RequestResponse.valueOf(config.getString("Duels.GUI.Items." + key + ".Response")));
+                inv.setItem(slot, item);
+            }
+        }
+    }
+
+    @Override
+    public void click(int slot, ClickType action, Player player) {
+        FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
+        if (action != ClickType.LEFT) {
+            processResponse(fallback, fPlayer);
+        } else {
+            processResponse(responseMap.get(slot), fPlayer);
+        }
+    }
+
+    public static void processResponse(RequestResponse response, FPlayer fPlayer) {
+        switch (response) {
+            case Accepted:
+                fPlayer.getFaction().broadcast(TL.DUEL_REQUEST_ACCEPTED_PLAYER.format(fPlayer.getNameAndTitle()));
+                Duels.acceptedDuel.add(fPlayer);
+                close(false, fPlayer);
+                break;
+            case Rejected:
+                fPlayer.getFaction().broadcast(TL.DUEL_REQUEST_REJECTED_PLAYER.format(fPlayer.getNameAndTitle()));
+                close(false, fPlayer);
+                break;
+        }
+    }
+
+    public static void close(Boolean reject, FPlayer fPlayer) {
+        if (reject) {
+            processResponse(RequestResponse.Rejected, fPlayer);
+        }
+        fPlayer.getPlayer().closeInventory();
+        Duels.guiMap.remove(fPlayer);
+    }
+
+    public static void closeSync(Boolean reject, FPlayer fPlayer) {
+        SyncExecutor.taskQueue.add(new SyncTask(RequestGUI.getInstance(), "close", reject, fPlayer));
+    }
+
+    @Override
+    public Inventory getInventory() {
+        return inv;
+    }
+}

src/main/java/com/massivecraft/factions/duels/RequestResponse.java

@@ -0,0 +1,10 @@
+package com.massivecraft.factions.duels;
+
+/**
+ * @author droppinganvil
+ */
+public enum RequestResponse {
+    Accepted,
+    Rejected,
+    Ignored,
+}

src/main/java/com/massivecraft/factions/duels/SpawnPoint.java

@@ -0,0 +1,27 @@
+package com.massivecraft.factions.duels;
+
+import org.bukkit.Location;
+
+public class SpawnPoint {
+    private Integer team;
+    private Integer id;
+    private Location location;
+
+    public SpawnPoint(Integer team, Location location, Integer id) {
+        this.team = team;
+        this.location = location;
+        this.id = id;
+    }
+
+    public Integer getTeam() {
+        return team;
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public Integer getID() {
+        return id;
+    }
+}

src/main/java/com/massivecraft/factions/event/PowerLossEvent.java

@@ -76,40 +76,32 @@ public class PowerLossEvent extends FactionPlayerEvent implements Cancellable {
 
     /**
      * Gets the configured damage to a players individual power on death
-     *
      * @return power to be lost as a Double.
      */
-    public double getDefaultPowerLost() {
-        return Conf.powerPerDeath;
-    }
+    public double getDefaultPowerLost() {return Conf.powerPerDeath;}
 
     /**
      * Gets the variable power lost. Custom power ignored when less than or equal to zero.
-     *
      * @return custom power to be lost as a Double.
      */
-    public double getCustomPowerLost() {
-        return this.modified;
-    }
+    public double getCustomPowerLost() {return this.modified;}
 
     /**
      * Sets the variable power lost. Custom power ignored when less than or equal to zero.
-     *
      * @param loss Double amount for the custom power loss to be set to.
      */
-    public void setCustomPowerLost(Double loss) {
-        modified = loss;
-    }
+    public void setCustomPowerLost(Double loss) {modified = loss;}
 
     /**
      * Determines if custom power is to be used.
-     *
      * @return If custom power is to be used as a boolean.
      */
     public boolean usingCustomPower() {
-        return modified > 0;
+        if (modified > 0) {
+            return true;
+        }
+        return false;
     }
-
     @Override
     public boolean isCancelled() {
         return cancelled;