Forgot about the FactionsPlayerListener

Added Simplified Chinese translation and fixed a typo in English language pack

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,7 +23,7 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Server VErsion (please complete the following information):**
+**Server Version (please complete the following information):**
  - Spigot Version: [e.g. Paperspigot 1.8.8]
  - Factions Version [use /f version]
  - Minecraft Version: [If a bug is dependent on client version]

README.md

@@ -1,9 +1,9 @@
 # SaberFactions
 
-![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)
+![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) [![](https://jitpack.io/v/SaberLLC/Saber-Factions.svg)](https://jitpack.io/#SaberLLC/Saber-Factions)
 
-SaberFactions is a fork of both FactionsUUID and SavageFactions. Creators of those plugins include DtrShock and ProSavage. Credits to them.
-SaberFactions is the newest, latest and greatest factions plugin designed for the best and most functional factions experience minecraft has seen!
+
+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. 
 
 ## Some Exciting Features
 Some of our features include the following 
@@ -14,21 +14,27 @@ Some of our features include the following
 * More F Upgrades - Unbreakable Redstone Upgrade, Members Upgrade, and Power Upgrade.
 * Factions Corner - In the corner of a world? No Problem /f corner will claim your entire buffer for you!
 * Command Cooldowns - Configurable Command Cooldowns for most "spam" commands. And so Much More to Come!
+* Faction Points - A point based currency that can be used for any aspect of factions gameplay!
+* Faction Shop - A shop that essentially lets players buy in-game items in exchange for faction points!
+* Faction Discord Integration - A discord intergrated factions bot for each faction to have their own personalized discord bot within their faction!
+* Faction Audit - A full based logging system (GUI designed) to see every aspect of what happens in your faction!
+* Factions Check System - An automated check system that alerts players when to check walls/buffers!
+* Faction Reserves - A system designed to reserve a specific faction name for a specific player!
 
 ## Dependency With Maven
 ```	
- <repositories>
-	<repository>
-	<id>jitpack.io</id>
-	<url>https://jitpack.io</url>
-  	</repository>
-</repositories>
+	<repositories>
+		<repository>
+		    <id>jitpack.io</id>
+		    <url>https://jitpack.io</url>
+		</repository>
+	</repositories>
 
-<dependency>
-	<groupId>com.github.Driftay</groupId>
-	<artifactId>Saber-Factions</artifactId>
-	<version>1.4.1</version>
-</dependency>
+	<dependency>
+	    <groupId>com.github.SaberLLC</groupId>
+	    <artifactId>Saber-Factions</artifactId>
+	    <version>2.3.3-STABLE</version>
+	</dependency>
 ```
 ## Moving Forward
 
@@ -36,8 +42,8 @@ Moving forward we plan to take all suggestions into consideration, as they come
 We Plan on Releasing the latest and greatest factions/skyblock/prison plugins minecraft has to offer and wont settle for anything less
 
 ## Support
-Our Discord is Currently In Progress of a Massive Overhaul, but we still encourage our community to join and express any concerns/questions/suggestions they may have
-https://Discord.Saber.pw
+Have a problem, question, or concer? We encourage our community to join and express any inquiry you may have
+https://discord.saber.pw
 
 Look forward to a bright future and a journey with all of you!
 

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.fupgrades" target="classFrame">CropUpgrades</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/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.fupgrades" target="classFrame">EXPUpgrade</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/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.fupgrades" target="classFrame">FUpgradesGUI</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/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.fupgrades" target="classFrame">SpawnerUpgrades</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/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.fupgrades">FUpgradesGUI</a></td>
+<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradesListener</a></td>
+<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a></td>
+<td class="colFirst"><a href="com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">CropUpgrades</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/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.fupgrades">EXPUpgrade</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/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.fupgrades">FUpgradesGUI</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/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.fupgrades">SpawnerUpgrades</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/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.fupgrades</a></th>
+<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.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.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>
+<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>
 <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.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,
+<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,
           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.fupgrades.UpgradeType,int)">
+<a id="setUpgrade(com.massivecraft.factions.zcore.frame.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.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.frame.fupgrades">UpgradeType</a>&nbsp;upgrade,
                 int&nbsp;level)</pre>
 </li>
 </ul>
-<a id="getUpgrade(com.massivecraft.factions.zcore.fupgrades.UpgradeType)">
+<a id="getUpgrade(com.massivecraft.factions.zcore.frame.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.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.frame.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.util.FactionWarpsFrame</li>
+<li>com.massivecraft.factions.zcore.frame.fdisband.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.InventoryTypeAdapter</li>
+<li>com.massivecraft.factions.util.adapters.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.LocationTypeAdapter</li>
+<li>com.massivecraft.factions.util.adapters.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.MapFLocToStringSetTypeAdapter</li>
+<li>com.massivecraft.factions.util.adapters.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.MyLocationTypeAdapter</li>
+<li>com.massivecraft.factions.util.adapters.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.PermissionsMapTypeAdapter</li>
+<li>com.massivecraft.factions.util.adapters.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.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.frame.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.fupgrades</div>
+<div class="subTitle">com.massivecraft.factions.zcore.frame.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.fupgrades.CropUpgrades</li>
+<li>com.massivecraft.factions.zcore.frame.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.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.frame.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.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>
+<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>
 </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.fupgrades</div>
+<div class="subTitle">com.massivecraft.factions.zcore.frame.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.fupgrades.EXPUpgrade</li>
+<li>com.massivecraft.factions.zcore.frame.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.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>
+<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>
 </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.fupgrades</a></div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.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.fupgrades.FUpgradesGUI</li>
+<li>com.massivecraft.factions.zcore.frame.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.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">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.fupgrades</div>
+<div class="subTitle">com.massivecraft.factions.zcore.frame.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.fupgrades.SpawnerUpgrades</li>
+<li>com.massivecraft.factions.zcore.frame.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.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">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.fupgrades</a></div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a>&gt;</li>
+<li>java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.fupgrades">UpgradeType</a>&gt;</li>
 <li>
 <ul class="inheritance">
-<li>com.massivecraft.factions.zcore.fupgrades.UpgradeType</li>
+<li>com.massivecraft.factions.zcore.frame.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.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.frame.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.fupgrades">UpgradeType</a>&gt;</pre>
+extends java.lang.Enum&lt;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a></code></td>
+<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a>[]</code></td>
+<td class="colFirst"><code>static <a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> CHEST</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> SPAWNER</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> EXP</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> CROP</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> POWER</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> REDSTONE</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> MEMBERS</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> TNT</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> WARP</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> DAMAGEINCREASE</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> DAMAGEDECREASE</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a> REINFORCEDARMOR</pre>
+<pre>public static final&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a>[]&nbsp;values()</pre>
+<pre class="methodSignature">public static&nbsp;<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.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.frame.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.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.frame.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.fupgrades</a></div>
+<div class="subTitle"><span class="packageLabelInType">Package</span>&nbsp;<a href="package-summary.html">com.massivecraft.factions.zcore.frame.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.fupgrades.UpgradesListener</li>
+<li>com.massivecraft.factions.zcore.frame.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.fupgrades</title>
+<title>com.massivecraft.factions.zcore.frame.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.fupgrades</a></h1>
+<h1 class="bar"><a href="../../../../../com/massivecraft/factions/zcore/fupgrades/package-summary.html" target="classFrame">com.massivecraft.factions.zcore.frame.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.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>
+<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>
 </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.fupgrades</title>
+<title>com.massivecraft.factions.zcore.frame.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.fupgrades</h1>
+<h1 title="Package" class="title">Package&nbsp;com.massivecraft.factions.zcore.frame.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.fupgrades">FUpgradesGUI</a></th>
+<th class="colFirst" scope="row"><a href="FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradesListener</a></th>
+<th class="colFirst" scope="row"><a href="UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades">UpgradeType</a></th>
+<th class="colFirst" scope="row"><a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades Class Hierarchy</title>
+<title>com.massivecraft.factions.zcore.frame.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,15 +22,15 @@
 <script type="text/javascript"><!--
     try {
         if (location.href.indexOf('is-external=true') == -1) {
-            parent.document.title="com.massivecraft.factions.zcore.fupgrades Class Hierarchy";
+            parent.document.title="com.massivecraft.factions.zcore.frame.fupgrades Class Hierarchy";
         }
     }
     catch(err) {
     }
 //-->
-var pathtoroot = "../../../../../";
-var useModuleDirectories = true;
-loadScripts(document, 'script');</script>
+    var pathtoroot = "../../../../../";
+    var useModuleDirectories = true;
+    loadScripts(document, 'script');</script>
 <noscript>
 <div>JavaScript is disabled on your browser.</div>
 </noscript>
@@ -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.fupgrades</h1>
+<h1 class="title">Hierarchy For Package com.massivecraft.factions.zcore.frame.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.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>
+<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>
 </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.fupgrades.<a href="UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades"><span class="typeNameLink">UpgradeType</span></a></li>
+<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>
 </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.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>
+<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>
 <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.fupgrades.UpgradeType,int)">setUpgrade</a></span>&#8203;(<a href="../fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.fupgrades">UpgradeType</a>&nbsp;upgrade,
+<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,
           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.fupgrades.UpgradeType)">
+<a id="getUpgrade(com.massivecraft.factions.zcore.frame.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.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.frame.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.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.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>
 </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.fupgrades.UpgradeType,int)">
+<a id="setUpgrade(com.massivecraft.factions.zcore.frame.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.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.frame.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.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.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>
 </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.fupgrades
+com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.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.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>
 <dd>&nbsp;</dd>
-<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>
+<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>
 <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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.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>
+<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>
 <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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradesListener.html" title="class in com.massivecraft.factions.zcore.frame.fupgrades">UpgradesListener</a></dt>
 <dd>&nbsp;</dd>
-<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>
+<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>
 <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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades</a> - package com.massivecraft.factions.zcore.fupgrades</dt>
+<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>
 <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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/UpgradeType.html" title="enum in com.massivecraft.factions.zcore.frame.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.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>
+<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>
 <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.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.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.frame.fupgrades.<a href="../com/massivecraft/factions/zcore/fupgrades/FUpgradesGUI.html" title="class in com.massivecraft.factions.zcore.frame.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.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.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>
 <dd>&nbsp;</dd>
-<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>
+<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>
 <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.fupgrades</a></th>
+<th class="colFirst" scope="row"><a href="com/massivecraft/factions/zcore/fupgrades/package-summary.html">com.massivecraft.factions.zcore.frame.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.fupgrades</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/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.fupgrades</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/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.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.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.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.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.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.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.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.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.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.fupgrades
+com.massivecraft.factions.zcore.frame.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.2.6-RC</version>
+    <version>1.6.9.5-2.3.9-RC</version>
     <packaging>jar</packaging>
 
     <name>SaberFactions</name>
@@ -41,6 +41,14 @@
                 <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>
@@ -100,7 +108,7 @@
         <dependency>
             <groupId>com.github.stefvanschie.inventoryframework</groupId>
             <artifactId>IF</artifactId>
-            <version>0.5.8</version>
+            <version>0.5.19</version>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
@@ -403,9 +411,19 @@
             <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,7 +1,6 @@
 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;
@@ -23,6 +22,7 @@ public class Conf {
     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 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 = 0;
-    public static int factionAltMemberLimit = 0;
+    public static int factionMemberLimit = 30;
+    public static int factionAltMemberLimit = 10;
     // 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,7 +87,9 @@ public class Conf {
     public static int factionBufferSize = 20;
     public static boolean useCheckSystem = true;
     public static boolean spawnerLock = false;
-    public static boolean gracePeriod = false;
+    public static boolean useGraceSystem = true;
+    public static boolean broadcastGraceToggles = true;
+    public static int gracePeriodTimeDays = 7;
     public static boolean noEnderpearlsInFly = false;
     public static boolean broadcastDescriptionChanges = false;
     public static boolean broadcastTagChanges = false;
@@ -96,15 +98,39 @@ public class Conf {
     public static double autoLeaveRoutineRunsEveryXMinutes = 5.0;
     public static int autoLeaveRoutineMaxMillisecondsPerTick = 5;  // 1 server tick is roughly 50ms, so default max 10% of a tick
     public static boolean removePlayerDataWhenBanned = true;
+    public static String removePlayerDataWhenBannedReason = "Banned by admin.";
     public static boolean autoLeaveDeleteFPlayerData = true; // Let them just remove player from Faction.
     public static boolean worldGuardChecking = false;
     public static boolean worldGuardBuildPriority = false;
+
+    //RADIUS CLAIMING
+    public static boolean useRadiusClaimSystem = true;
+
+    //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 useStealthSystem = true;
+
+    //STRIKES
+    public static boolean useStrikeSystem = true;
+
     //DISCORD
     public static boolean useDiscordSystem = false;
     public static String discordBotToken = "<token here>";
@@ -120,7 +146,7 @@ public class Conf {
     public static Boolean factionDiscordTags = false;
     public static String factionTag = "(NAME) [FACTION]";
     public static Boolean factionRoles = false;
-    public static List<Integer> factionRoleColor = new ArrayList<Integer>(){{
+    public static List<Integer> factionRoleColor = new ArrayList<Integer>() {{
         add(25);
         add(162);
         add(203);
@@ -139,7 +165,6 @@ 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;
@@ -254,8 +279,8 @@ public class Conf {
     /// Useful for HCF features.
     /// </summary>
     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<>();
@@ -265,7 +290,7 @@ public class Conf {
     public static boolean econEnabled = false;
     public static String econUniverseAccount = "";
     public static double econCostClaimWilderness = 30.0;
-    public static double econCostClaimFromFactionBonus = 30.0;
+    public static double econCostClaimFromFactionBonus = 0.0;
     public static double econOverclaimRewardMultiplier = 0.0;
     public static double econClaimAdditionalMultiplier = 0.5;
     public static double econClaimRefundMultiplier = 0.7;
@@ -401,6 +426,10 @@ public class Conf {
     public static HashMap<String, DefaultPermissions> defaultFactionPermissions = new HashMap<>();
     public static HashSet<PermissableAction> lockedPermissions = new HashSet<>();
 
+    public static boolean useComplexFly = true;
+
+    public static boolean wildLoadChunkBeforeTeleport = true;
+
     private static transient Conf i = new Conf();
 
     static {
@@ -531,7 +560,6 @@ public class Conf {
             territoryDenyUsageMaterials.add(Material.ARMOR_STAND);
         }
 
-
         territoryProtectedMaterialsWhenOffline.add(Material.BEACON);
 
         territoryDenyUsageMaterialsWhenOffline.add(XMaterial.FIRE_CHARGE.parseMaterial());
@@ -577,7 +605,9 @@ 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,6 +14,7 @@ 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 {
@@ -150,7 +151,9 @@ 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
@@ -178,8 +181,8 @@ public class FLocation implements Serializable {
     }
 
     public boolean isInChunk(Location loc) {
-        if(loc == null) return false;
-        if(loc.getWorld() == null) return false;
+        if (loc == null) return false;
+        if (loc.getWorld() == null) return false;
 
         Chunk chunk = loc.getChunk();
         return loc.getWorld().getName().equalsIgnoreCase(getWorldName()) && chunk.getX() == x && chunk.getZ() == z;

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

@@ -34,60 +34,70 @@ 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 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();
@@ -278,6 +288,11 @@ public interface FPlayer extends EconomyParticipator {
 
     boolean hasMoney(int amt);
 
+    //Fplayer specific friendly fire.
+    boolean hasFriendlyFire();
+
+    void setFriendlyFire(boolean status);
+
     //inspect Stuff
 
     boolean isInspectMode();
@@ -377,6 +392,7 @@ 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.fupgrades.UpgradeType;
+import com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
@@ -247,6 +247,8 @@ 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,6 +12,7 @@ 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;
@@ -20,31 +21,32 @@ 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.Particles.ReflectionUtils;
+import com.massivecraft.factions.util.adapters.*;
+import com.massivecraft.factions.util.timer.TimerManager;
+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.fupgrades.UpgradesListener;
-import com.massivecraft.factions.zcore.util.TextUtil;
+import com.massivecraft.factions.zcore.frame.fupgrades.UpgradesListener;
 import me.lucko.commodore.CommodoreProvider;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
-import org.bukkit.*;
+import org.bstats.bukkit.Metrics;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
@@ -54,7 +56,6 @@ import java.lang.reflect.Type;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
 import java.util.stream.Collectors;
 
@@ -64,12 +65,12 @@ public class FactionsPlugin extends MPlugin {
     // Our single plugin instance.
     // Single 4 life.
     public static FactionsPlugin instance;
+    public static boolean cachedRadiusClaim;
     public static Permission perms = null;
     // This plugin sets the boolean true when fully enabled.
     // Plugins can check this boolean while hooking in have
     // a green light to use the api.
     public static boolean startupFinished = false;
-    public static Economy econ = null;
     public boolean PlaceholderApi;
     // Commands
     public FCmdRoot cmdBase;
@@ -79,8 +80,9 @@ public class FactionsPlugin extends MPlugin {
     public boolean mc112 = false;
     public boolean mc113 = false;
     public boolean mc114 = false;
+    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;
@@ -90,11 +92,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;
@@ -104,6 +106,10 @@ public class FactionsPlugin extends MPlugin {
         return instance;
     }
 
+    public FileManager getFileManager() {
+        return fileManager;
+    }
+
     public boolean getLocked() {
         return this.locked;
     }
@@ -122,28 +128,20 @@ public class FactionsPlugin extends MPlugin {
         this.setAutoSave(val);
     }
 
-    public void playSoundForAll(String sound) {
-        for (Player pl : Bukkit.getOnlinePlayers()) playSound(pl, sound);
-    }
-
-    public void playSoundForAll(List<String> sounds) {
-        for (Player pl : Bukkit.getOnlinePlayers()) playSound(pl, sounds);
-    }
-
-    public void playSound(Player p, List<String> sounds) {
-        for (String sound : sounds) playSound(p, sound);
-    }
-
-    public void playSound(Player p, String sound) {
-        float pitch = Float.parseFloat(sound.split(":")[1]);
-        sound = sound.split(":")[0];
-        p.playSound(p.getLocation(), Sound.valueOf(sound), pitch, 5.0F);
-    }
-
     @Override
     public void onEnable() {
         log("==== Setup ====");
 
+        if (getServer().getPluginManager().getPlugin("Vault") == null) {
+            divider();
+            System.out.println("You are missing dependencies!");
+            System.out.println("Please verify [Vault] is installed!");
+            Conf.save();
+            Bukkit.getPluginManager().disablePlugin(instance);
+            divider();
+            return;
+        }
+
         int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
         switch (version) {
             case 7:
@@ -165,36 +163,34 @@ public class FactionsPlugin extends MPlugin {
                 FactionsPlugin.instance.log("Minecraft Version 1.14 found.");
                 mc114 = true;
                 break;
+            case 15:
+                FactionsPlugin.instance.log("Minecraft Version 1.15 found.");
+                mc115 = true;
+                break;
         }
         migrateFPlayerLeaders();
         log("==== End Setup ====");
 
-        if (!preEnable()) return;
-        this.loadSuccessful = false;
+        int pluginId = 7013;
+        Metrics metrics = new Metrics(this, pluginId);
 
-        if (!new File(this.getDataFolder() + "/config.yml").exists()) {
-            this.saveResource("config.yml", false);
-            this.reloadConfig();
-        }
-        //Attempt to generate a permission list
-        PermissionList.generateFile();
-        // Load Conf from disk
-        Conf.load();
-        fLogManager = new FLogManager();
-        //Dependency checks
-        if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault") && !Bukkit.getPluginManager().isPluginEnabled("Essentials"))) {
-            divider();
-            System.out.println("You are missing dependencies!");
-            System.out.println("Please verify EssentialsX and Vault are installed!");
-            Conf.save();
-            Bukkit.getPluginManager().disablePlugin(instance);
-            divider();
+        if (!preEnable()) {
+            this.loadSuccessful = false;
             return;
         }
-        //Update their config if needed
-        // Updater.updateIfNeeded(getConfig());
-        RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
-        FactionsPlugin.econ = rsp.getProvider();
+
+        saveDefaultConfig();
+        this.reloadConfig();
+        //Start wait task executor
+        WaitExecutor.startTask();
+        // Load Conf from disk
+        Conf.load();
+
+        fileManager = new FileManager();
+        fileManager.setupFiles();
+
+        fLogManager = new FLogManager();
+
         com.massivecraft.factions.integration.Essentials.setup();
         hookedPlayervaults = setupPlayervaults();
         FPlayers.getInstance().load();
@@ -211,6 +207,12 @@ public class FactionsPlugin extends MPlugin {
             else faction.addFPlayer(fPlayer);
         }
 
+        Factions.getInstance().getAllFactions().forEach(Faction::refreshFPlayers);
+
+        if (getConfig().getBoolean("enable-faction-flight", true)) {
+            UtilFly.run();
+        }
+
 
         Board.getInstance().load();
         Board.getInstance().clean();
@@ -230,15 +232,15 @@ public class FactionsPlugin extends MPlugin {
         // start up task which runs the autoLeaveAfterDaysOfInactivity routine
         startAutoLeaveTask(false);
 
+        cachedRadiusClaim = Conf.useRadiusClaimSystem;
+
         if (version > 8) {
             useNonPacketParticles = true;
             log("Minecraft Version 1.9 or higher found, using non packet based particle API");
         }
 
-        if (getConfig().getBoolean("enable-faction-flight")) factionsFlight = true;
-
         if (getServer().getPluginManager().getPlugin("Skript") != null) {
-            log("Skript was found! Registering FactionsPlugin Addon...");
+            log("Skript was found! Registering SaberFactions Addon...");
             skriptAddon = Skript.registerAddon(this);
             try {
                 skriptAddon.loadClasses("com.massivecraft.factions.skript", "expressions");
@@ -247,6 +249,7 @@ public class FactionsPlugin extends MPlugin {
             }
             log("Skript addon registered!");
         }
+
         if (Conf.useCheckSystem) {
             int minute = 1200;
             this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 3), 0L, minute * 3);
@@ -260,9 +263,12 @@ 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
@@ -281,9 +287,14 @@ public class FactionsPlugin extends MPlugin {
         for (Listener eventListener : eventsListener)
             getServer().getPluginManager().registerEvents(eventListener, this);
 
+        if (Conf.useGraceSystem) {
+            getServer().getPluginManager().registerEvents(timerManager.graceTimer, this);
+        }
+
         this.getCommand(refCommand).setExecutor(cmdBase);
 
         if (!CommodoreProvider.isSupported()) this.getCommand(refCommand).setTabCompleter(this);
+
         reserveObjects = new ArrayList<>();
         String path = Paths.get(this.getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
         File file = new File(path);
@@ -303,6 +314,7 @@ 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!");
@@ -318,10 +330,6 @@ public class FactionsPlugin extends MPlugin {
         FactionsPlugin.startupFinished = true;
     }
 
-    public SkriptAddon getSkriptAddon() {
-        return skriptAddon;
-    }
-
 
     private void setupPlaceholderAPI() {
         Plugin clip = getServer().getPluginManager().getPlugin("PlaceholderAPI");
@@ -415,6 +423,7 @@ 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);
     }
@@ -427,24 +436,32 @@ public class FactionsPlugin extends MPlugin {
 
     @Override
     public void onDisable() {
-        // only save data if plugin actually completely loaded successfully
-        if (this.loadSuccessful) Conf.saveSync();
-
-
-        if (AutoLeaveTask != null) {
-            this.getServer().getScheduler().cancelTask(AutoLeaveTask);
-            AutoLeaveTask = null;
+        if (this.AutoLeaveTask != null) {
+            getServer().getScheduler().cancelTask(this.AutoLeaveTask);
+            this.AutoLeaveTask = null;
         }
+
+        Conf.saveSync();
+        timerManager.saveTimerData();
         DiscordListener.saveGuilds();
-        if (Discord.jda != null) {
-            Discord.jda.shutdownNow();
-        }
-        super.onDisable();
+
+        if (Discord.jda != null) Discord.jda.shutdownNow();
+
+        fLogManager.saveLogs();
+
         try {
-            fLogManager.saveLogs();
-        } catch (Exception e) {
+            String path = Paths.get(getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
+            File file = new File(path);
+            if (!file.exists()) {
+                file.getParentFile().mkdirs();
+                file.createNewFile();
+            }
+            Files.write(Paths.get(file.getPath()), getGsonBuilder().create().toJson(reserveObjects).getBytes());
+        } catch (IOException e) {
             e.printStackTrace();
         }
+
+        super.onDisable();
     }
 
     public void startAutoLeaveTask(boolean restartIfRunning) {
@@ -465,26 +482,9 @@ public class FactionsPlugin extends MPlugin {
         Conf.save();
     }
 
-    public ItemStack createItem(Material material, int amount, short datavalue, String name, List<String> lore) {
-        ItemStack item = new ItemStack(XMaterial.matchXMaterial(material.toString()).parseMaterial(), amount, datavalue);
-        ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(color(name));
-        meta.setLore(colorList(lore));
-        item.setItemMeta(meta);
-        return item;
-    }
-
-    public ItemStack createLazyItem(Material material, int amount, short datavalue, String name, String lore) {
-        ItemStack item = new ItemStack(material, amount, datavalue);
-        ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(color(FactionsPlugin.instance.getConfig().getString(name)));
-        meta.setLore(colorList(FactionsPlugin.instance.getConfig().getStringList(lore)));
-        item.setItemMeta(meta);
-        return item;
-    }
 
     public Economy getEcon() {
-        RegisteredServiceProvider<Economy> rsp = FactionsPlugin.instance.getServer().getServicesManager().getRegistration(Economy.class);
+        RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
         return rsp.getProvider();
     }
 
@@ -499,14 +499,6 @@ 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
@@ -517,7 +509,6 @@ public class FactionsPlugin extends MPlugin {
         List<FCommand> commandsList = cmdBase.subCommands;
         FCommand commandsEx = cmdBase;
         List<String> completions = new ArrayList<>();
-
         // Check for "" first arg because spigot is mangled.
         if (context.args.get(0).equals("")) {
             for (FCommand subCommand : commandsEx.subCommands) {
@@ -565,70 +556,11 @@ public class FactionsPlugin extends MPlugin {
     // Functions for other plugins to hook into
     // -------------------------------------------- //
 
-    // This value will be updated whenever new hooks are added
-    public int hookSupportVersion() {
-        return 3;
-    }
-
     // If another plugin is handling insertion of chat tags, this should be used to notify Factions
     public void handleFactionTagExternally(boolean notByFactions) {
         Conf.chatTagHandledByAnotherPlugin = notByFactions;
     }
 
-    // Simply put, should this chat event be left for Factions to handle? For now, that means players with Faction Chat
-    // enabled or use of the Factions f command without a slash; combination of isPlayerFactionChatting() and isFactionsCommand()
-
-    public boolean shouldLetFactionsHandleThisChat(AsyncPlayerChatEvent event) {
-        return event != null && (isPlayerFactionChatting(event.getPlayer()) || isFactionsCommand(event.getMessage()));
-    }
-
-
-    // Does player have Faction Chat enabled? If so, chat plugins should preferably not do channels,
-    // local chat, or anything else which targets individual recipients, so Faction Chat can be done
-    public boolean isPlayerFactionChatting(Player player) {
-        if (player == null) return false;
-        FPlayer me = FPlayers.getInstance().getByPlayer(player);
-        return me != null && me.getChatMode().isAtLeast(ChatMode.ALLIANCE);
-    }
-
-    // Is this chat message actually a Factions command, and thus should be left alone by other plugins?
-
-    // TODO: GET THIS BACK AND WORKING
-
-    public boolean isFactionsCommand(String check) {
-        return !(check == null || check.isEmpty()) && this.handleCommand(null, check, true);
-    }
-
-    // Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat
-    public String getPlayerFactionTag(Player player) {
-        return getPlayerFactionTagRelation(player, null);
-    }
-
-    // Same as above, but with relation (enemy/neutral/ally) coloring potentially added to the tag
-    public String getPlayerFactionTagRelation(Player speaker, Player listener) {
-        String tag = "~";
-
-        if (speaker == null) return tag;
-
-
-        FPlayer me = FPlayers.getInstance().getByPlayer(speaker);
-        if (me == null) return tag;
-        // if listener isn't set, or config option is disabled, give back uncolored tag
-        if (listener == null || !Conf.chatTagRelationColored) {
-            tag = me.getChatTag().trim();
-        } else {
-            FPlayer you = FPlayers.getInstance().getByPlayer(listener);
-            if (you == null) {
-                tag = me.getChatTag().trim();
-            } else { // everything checks out, give the colored tag
-                tag = me.getChatTag(you).trim();
-            }
-        }
-        if (tag.isEmpty()) tag = "~";
-        return tag;
-    }
-
-
     public FLogManager getFlogManager() {
         return fLogManager;
     }
@@ -637,14 +569,6 @@ public class FactionsPlugin extends MPlugin {
         this.fLogManager.log(faction, type, arguments);
     }
 
-    // Get a player's title within their faction, mainly for usage by chat plugins for local/channel chat
-    public String getPlayerTitle(Player player) {
-        if (player == null) return "";
-        FPlayer me = FPlayers.getInstance().getByPlayer(player);
-        if (me == null) return "";
-        return me.getTitle().trim();
-    }
-
     public String color(String line) {
         line = ChatColor.translateAlternateColorCodes('&', line);
         return line;
@@ -656,47 +580,17 @@ public class FactionsPlugin extends MPlugin {
         return lore;
     }
 
-    // Get a list of all faction tags (names)
-    public Set<String> getFactionTags() {
-        return Factions.getInstance().getFactionTags();
-    }
-
     public List<ReserveObject> getFactionReserves() {
         return this.reserveObjects;
     }
 
-    // Get a list of all players in the specified faction
-    public Set<String> getPlayersInFaction(String factionTag) {
-        Set<String> players = new HashSet<>();
-        Faction faction = Factions.getInstance().getByTag(factionTag);
-        if (faction != null) {
-            for (FPlayer fplayer : faction.getFPlayers()) players.add(fplayer.getName());
-        }
-        return players;
-    }
-
-    // Get a list of all online players in the specified faction
-    public Set<String> getOnlinePlayersInFaction(String factionTag) {
-        Set<String> players = new HashSet<>();
-        Faction faction = Factions.getInstance().getByTag(factionTag);
-        if (faction != null) {
-            for (FPlayer fplayer : faction.getFPlayersWhereOnline(true)) players.add(fplayer.getName());
-        }
-        return players;
-    }
-
-    public boolean isHookedPlayervaults() {
-        return hookedPlayervaults;
-    }
 
     public String getPrimaryGroup(OfflinePlayer player) {
-        AtomicReference<String> primaryGroup = new AtomicReference<>();
+        return perms == null || !perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player);
+    }
 
-        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 TimerManager getTimerManager() {
+        return timerManager;
     }
 
     public void debug(Level level, String s) {
@@ -711,7 +605,4 @@ public class FactionsPlugin extends MPlugin {
         debug(Level.INFO, s);
     }
 
-    public Worldguard getWg() {
-        return wg;
-    }
 }

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

@@ -10,6 +10,9 @@ 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 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"));
@@ -21,8 +24,10 @@ 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"));
@@ -36,6 +41,7 @@ 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"));
@@ -143,6 +149,7 @@ public class Aliases {
     public static ArrayList<String> vault = new ArrayList<>(Collections.singletonList("vault"));
     public static ArrayList<String> viewChest = new ArrayList<>(Arrays.asList("viewchest", "viewpv"));
     private static transient Aliases i = new Aliases();
+
     public static void load() {
         FactionsPlugin.getInstance().persist.loadOrSaveDefault(i, Aliases.class, "aliases");
     }

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

@@ -57,6 +57,10 @@ public class CmdAdmin extends FCommand {
                 return;
             }
 
+            if (fyou.isAlt()) {
+                return;
+            }
+
             // only perform a FPlayerJoinEvent when newLeader isn't actually in the faction
             if (fyou.getFaction() != targetFaction) {
                 FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), targetFaction, FPlayerJoinEvent.PlayerJoinReason.LEADER);
@@ -86,24 +90,20 @@ public class CmdAdmin extends FCommand {
             FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), fyou.getName(), ChatColor.RED + "Admin");
 
             // Inform all players
-            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-                fplayer.msg(TL.COMMAND_ADMIN_PROMOTED,
-                        context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true),
-                        fyou.describeTo(fplayer), targetFaction.describeTo(fplayer));
+            if (FactionsPlugin.instance.getConfig().getBoolean("faction-leader-broadcast")) {
+                for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
+                    fplayer.msg(TL.COMMAND_ADMIN_PROMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true), fyou.describeTo(fplayer), targetFaction.describeTo(fplayer));
+                }
             }
         });
     }
 
     private void setRole(FPlayer fp, Role r) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> {
-            fp.setRole(r);
-        });
+        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> fp.setRole(r));
     }
 
     private void promoteNewLeader(Faction f) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> {
-            f.promoteNewLeader();
-        });
+        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, (Runnable) f::promoteNewLeader);
     }
 
     public TL getUsageTranslation() {

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

@@ -46,6 +46,7 @@ public class CmdBanner extends FCommand {
         warBanner.setAmount(1);
         context.player.getInventory().addItem(warBanner);
     }
+
     @Deprecated
     public boolean hasMoney(FPlayer fme, int amt) {
         Economy econ = FactionsPlugin.getInstance().getEcon();
@@ -55,6 +56,7 @@ public class CmdBanner extends FCommand {
         fme.msg(TL.COMMAND_BANNER_NOTENOUGHMONEY);
         return false;
     }
+
     @Deprecated
     public void takeMoney(FPlayer fme, int amt) {
         if (this.hasMoney(fme, amt)) {

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

@@ -2,7 +2,10 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.WarmUpUtil;
+import com.massivecraft.factions.zcore.fperms.Access;
+import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdCheckpoint extends FCommand {
@@ -17,10 +20,7 @@ public class CmdCheckpoint extends FCommand {
 
         this.optionalArgs.put("set", "");
 
-        this.requirements = new CommandRequirements.Builder(Permission.CHECKPOINT)
-                .playerOnly()
-                .memberOnly()
-                .build();
+        this.requirements = new CommandRequirements.Builder(Permission.CHECKPOINT).playerOnly().memberOnly().build();
     }
 
     @Override
@@ -29,18 +29,39 @@ public class CmdCheckpoint extends FCommand {
             context.msg(TL.COMMAND_CHECKPOINT_DISABLED);
             return;
         }
-        if (context.args.size() == 1) {
-            FLocation myLocation = new FLocation(context.player.getLocation());
-            Faction myLocFaction = Board.getInstance().getFactionAt(myLocation);
-            if (myLocFaction == Factions.getInstance().getWilderness() || myLocFaction == context.faction) {
-                context.faction.setCheckpoint(context.player.getLocation());
-                context.msg(TL.COMMAND_CHECKPOINT_SET);
-                return;
+        if (context.args.size() == 1 && context.args.get(0).equalsIgnoreCase("set")) {
+            if (context.fPlayer.getRole() == Role.LEADER) {
+                FLocation myLocation = new FLocation(context.player.getLocation());
+                Faction myLocFaction = Board.getInstance().getFactionAt(myLocation);
+                if (myLocFaction == Factions.getInstance().getWilderness() || myLocFaction == context.faction) {
+                    context.faction.setCheckpoint(context.player.getLocation());
+                    context.msg(TL.COMMAND_CHECKPOINT_SET);
+                    return;
+                }
             } else {
                 context.msg(TL.COMMAND_CHECKPOINT_INVALIDLOCATION);
                 return;
             }
+
+            PermissableAction action = PermissableAction.SETWARP;
+            Access access = context.faction.getAccess(context.fPlayer, action);
+            if (access == Access.DENY) {
+                context.msg(TL.GENERIC_FPERM_NOPERMISSION, action.getName());
+                return;
+            } else {
+                FLocation myLocation = new FLocation(context.player.getLocation());
+                Faction myLocFaction = Board.getInstance().getFactionAt(myLocation);
+                if (myLocFaction == Factions.getInstance().getWilderness() || myLocFaction == context.faction) {
+                    context.faction.setCheckpoint(context.player.getLocation());
+                    context.msg(TL.COMMAND_CHECKPOINT_SET);
+                    return;
+                } else {
+                    context.msg(TL.COMMAND_CHECKPOINT_INVALIDLOCATION);
+                    return;
+                }
+            }
         }
+
         if (context.faction.getCheckpoint() == null) {
             context.msg(TL.COMMAND_CHECKPOINT_NOT_SET);
             return;
@@ -57,8 +78,6 @@ public class CmdCheckpoint extends FCommand {
         } else {
             context.msg(TL.COMMAND_CHECKPOINT_CLAIMED);
         }
-
-
     }
 
     @Override

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

@@ -55,6 +55,10 @@ public class CmdColeader extends FCommand {
             return;
         }
 
+        if (you.isAlt()) {
+            return;
+        }
+
         if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
             context.msg(TL.COMMAND_COLEADER_NOTADMIN);
             return;

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

@@ -225,7 +225,7 @@ public class CmdConfig extends FCommand {
         if (!success.isEmpty()) {
             if (context.sender instanceof Player) {
                 context.sendMessage(success);
-                FactionsPlugin.getInstance().log(success + TL.COMMAND_CONFIG_LOG.format((Player) context.sender));
+                FactionsPlugin.getInstance().log(success + TL.COMMAND_CONFIG_LOG.format(context.sender));
             } else  // using FactionsPlugin.getInstance().log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log
             {
                 FactionsPlugin.getInstance().log(success);

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

@@ -1,12 +1,14 @@
 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;
@@ -52,6 +54,17 @@ 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);
@@ -85,7 +98,9 @@ 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);
@@ -96,6 +111,7 @@ 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));
@@ -115,7 +131,9 @@ public class CmdCreate extends FCommand {
                     Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
                 }
             }
-        } catch (HierarchyException e) {System.out.print(e.getMessage());}
+        } catch (HierarchyException e) {
+            System.out.print(e.getMessage());
+        }
         //End Discord
         context.msg(TL.COMMAND_CREATE_YOUSHOULD, FactionsPlugin.getInstance().cmdBase.cmdDescription.getUsageTemplate(context));
         if (Conf.econEnabled) Econ.setBalance(faction.getAccountId(), Conf.econFactionStartingBalance);

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

@@ -13,6 +13,7 @@ public class CmdDebug extends FCommand {
         this.aliases.add("debug");
         this.requirements = new CommandRequirements.Builder(Permission.DEBUG).build();
     }
+
     @Override
     public void perform(CommandContext context) {
         FactionsPlugin.getInstance().divider();
@@ -51,7 +52,9 @@ public class CmdDebug extends FCommand {
         System.out.print("Emotes enabled: " + Discord.useEmotes);
         System.out.print("Leader role null: " + (Discord.leader == null ? "True" : "False"));
         System.out.print("Attempt Log:");
-        for (DiscordSetupAttempt d : Discord.setupLog) {System.out.print(d.getDifferentialFormatted() + " " + d.getSuccess() + " " + d.getReason());}
+        for (DiscordSetupAttempt d : Discord.setupLog) {
+            System.out.print(d.getDifferentialFormatted() + " " + d.getSuccess() + " " + d.getReason());
+        }
         System.out.print("End Attempt Log");
         System.out.print("----End Discord----");
         System.out.print("--------End Debug Info--------");

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

@@ -3,10 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 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.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
@@ -25,53 +22,36 @@ public class CmdDeinvite extends FCommand {
         this.optionalArgs.put("player name", "name");
 
         this.requirements = new CommandRequirements.Builder(Permission.DEINVITE)
+                .withAction(PermissableAction.INVITE)
                 .memberOnly()
                 .build();
     }
 
     @Override
     public void perform(CommandContext context) {
-            if (context.args.size() == 0) {
-                FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
-                for (String id : context.faction.getInvites()) {
-                    FPlayer fp = FPlayers.getInstance().getById(id);
-                    String name = fp != null ? fp.getName() : id;
-                    msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
-                }
-                context.sendFancyMessage(msg);
-                return;
+        FPlayer you = context.argAsBestFPlayerMatch(0);
+        if (you == null) {
+            FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
+            for (String id : context.faction.getInvites()) {
+                FPlayer fp = FPlayers.getInstance().getById(id);
+                String name = fp != null ? fp.getName() : id;
+                msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
             }
+            context.sendFancyMessage(msg);
+            return;
+        }
 
-            FPlayer you = context.argAsBestFPlayerMatch(0);
-            if (!context.fPlayer.isAdminBypassing()) {
-                Access access = context.faction.getAccess(context.fPlayer, PermissableAction.INVITE);
-                if (access != Access.ALLOW && context.fPlayer.getRole() != Role.LEADER) {
-                    context.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
-                    return;
-                }
-            }
+        if (you.getFaction() == context.faction) {
+            context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag());
+            context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FCmdRoot.instance.cmdKick.getUsageTemplate(context));
+            return;
+        }
 
-            if (you == null) {
-                FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
-                for (String id : context.faction.getInvites()) {
-                    if (context.faction.getInvites().isEmpty()) return;
-                    FPlayer fp = FPlayers.getInstance().getById(id);
-                    String name = fp != null ? fp.getName() : id;
-                    msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
-                }
-                context.sendFancyMessage(msg);
-                return;
-            }
+        context.faction.deinvite(you);
 
-            if (you.getFaction() == context.faction) {
-                context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag());
-                context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context));
-                return;
-            }
+        you.msg(TL.COMMAND_DEINVITE_REVOKED, context.fPlayer.describeTo(you), context.faction.describeTo(you));
 
-            context.faction.deinvite(you);
-            you.msg(TL.COMMAND_DEINVITE_REVOKED, context.fPlayer.describeTo(you), context.faction.describeTo(you));
-            context.faction.msg(TL.COMMAND_DEINVITE_REVOKES, context.fPlayer.describeTo(context.faction), you.describeTo(context.faction));
+        context.faction.msg(TL.COMMAND_DEINVITE_REVOKES, context.fPlayer.describeTo(context.faction), you.describeTo(context.faction));
     }
 
     @Override

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

@@ -0,0 +1,51 @@
+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,14 +4,16 @@ 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.UtilFly;
+import com.massivecraft.factions.util.Cooldown;
 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.command.ConsoleCommandSender;
 
 import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
 
 
 public class CmdDisband extends FCommand {
@@ -20,8 +22,6 @@ public class CmdDisband extends FCommand {
      * @author FactionsUUID Team
      */
 
-    //TODO: Add Disband Confirmation GUI
-
     private static HashMap<String, String> disbandMap = new HashMap<>();
 
 
@@ -35,6 +35,7 @@ public class CmdDisband extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
+        long time;
         // The faction, default to your own.. but null if console sender.
         Faction faction = context.argAsFaction(0, context.fPlayer == null ? null : context.faction);
         if (faction == null) return;
@@ -42,9 +43,7 @@ public class CmdDisband extends FCommand {
         boolean isMyFaction = context.fPlayer != null && faction == context.faction;
 
         if (!isMyFaction) {
-            if (!Permission.DISBAND_ANY.has(context.sender, true)) {
-                return;
-            }
+            if (!Permission.DISBAND_ANY.has(context.sender, true)) return;
         }
 
 
@@ -71,6 +70,26 @@ 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)) {
+            access = true;
+        }
+
+        if (!access) {
+            if (Conf.useDisbandGUI && (!context.fPlayer.isAdminBypassing() || !context.player.isOp())) {
+                if (!disbandMap.containsKey(context.player.getUniqueId().toString())) {
+                    new FDisbandFrame(context.faction).buildGUI(context.fPlayer);
+                    return;
+                }
+            }
+        }
+
         // 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() + ""));
@@ -82,21 +101,15 @@ public class CmdDisband extends FCommand {
                     String amountString = context.sender instanceof ConsoleCommandSender ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(follower);
                     if (follower.getFaction() == faction) {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
-                        if (!follower.canFlyAtLocation() && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
-                            follower.setFFlying(false, false);
-                        }
                     } else {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
                     }
                 }
-                if(FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) context.fPlayer.setFFlying(false, false);
             } else {
                 context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
             }
             faction.disband(context.player, PlayerDisbandReason.COMMAND);
-            if (!context.fPlayer.canFlyAtLocation() && 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"));
         }
     }
 

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

@@ -6,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 import java.util.Random;
 
+/**
+ * @author SaberTeam
+ */
+
 public class CmdDiscord extends FCommand {
     public CmdDiscord() {
         super();
@@ -14,6 +18,7 @@ public class CmdDiscord extends FCommand {
                 .playerOnly()
                 .build();
     }
+
     @Override
     public void perform(CommandContext context) {
         if (context.fPlayer.discordSetup()) {

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

@@ -7,15 +7,14 @@ 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;
-import org.bukkit.entity.Player;
 
 import java.text.DecimalFormat;
 
 /**
  * @author Saser
  */
-public class CmdDrain extends FCommand{
-    public CmdDrain(){
+public class CmdDrain extends FCommand {
+    public CmdDrain() {
         this.aliases.addAll(Aliases.drain);
         this.requirements = new CommandRequirements.Builder(Permission.DRAIN)
                 .playerOnly()
@@ -34,12 +33,12 @@ public class CmdDrain extends FCommand{
 
         double totalBalance = 0;
 
-        for(FPlayer fPlayer : context.faction.getFPlayers()) {
-            if(context.faction.getFPlayers().size() == 1){
+        for (FPlayer fPlayer : context.faction.getFPlayers()) {
+            if (context.faction.getFPlayers().size() == 1) {
                 context.fPlayer.msg(TL.COMMAND_DRAIN_NO_PLAYERS);
                 return;
             }
-            if (FPlayers.getInstance().getByPlayer(context.player).equals(fPlayer)){
+            if (FPlayers.getInstance().getByPlayer(context.player).equals(fPlayer)) {
                 continue; // skip the command executor
             }
             double balance = FactionsPlugin.getInstance().getEcon().getBalance(fPlayer.getPlayer());

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

@@ -9,7 +9,6 @@ import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -20,6 +19,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class CmdFly extends FCommand {
 
+    public static final boolean fly = FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight");
     /**
      * @author FactionsUUID Team
      */
@@ -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 CmdFly() {
@@ -42,15 +41,12 @@ public class CmdFly extends FCommand {
     }
 
     public static void startParticles() {
-
         particleTask = Bukkit.getScheduler().runTaskTimerAsynchronously(FactionsPlugin.instance, () -> {
             for (String name : flyMap.keySet()) {
                 Player player = Bukkit.getPlayer(name);
                 if (player == null) continue;
                 if (!player.isFlying()) continue;
-                if (!FactionsPlugin.getInstance().mc17) {
-                    if (player.getGameMode() == GameMode.SPECTATOR) continue;
-                }
+                if (!FactionsPlugin.getInstance().mc17 && player.getGameMode() == GameMode.SPECTATOR) continue;
 
                 FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
                 fplayer.isVanished();
@@ -62,78 +58,49 @@ public class CmdFly extends FCommand {
         }, 10L, 3L);
     }
 
-    public static void startFlyCheck() {
-        flyTask = Bukkit.getScheduler().runTaskTimerAsynchronously(FactionsPlugin.instance, () -> {
-            checkTaskState();
-            if (flyMap.keySet().size() != 0) {
-                for (String name : flyMap.keySet()) {
-                    if (name == null) {
-                        continue;
-                    }
-                    Player player = Bukkit.getPlayer(name);
-                    if (player == null
-                            || !player.isFlying()
-                            || player.getGameMode() == GameMode.CREATIVE
-                            || !FactionsPlugin.getInstance().mc17 && player.getGameMode() == GameMode.SPECTATOR) {
-                        continue;
-                    }
-                    FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
-                    Faction myFaction = fPlayer.getFaction();
-                    if (!player.hasPermission("factions.fly.bypassnearbyenemycheck") && !fPlayer.isAdminBypassing()) {
-                        if (fPlayer.hasEnemiesNearby()) disableFlightSync(fPlayer);
-                        checkEnemiesSync(fPlayer);
-                        continue;
-                    }
-                    FLocation myFloc = new FLocation(player.getLocation());
-                    if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
-                        if (!checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
-                            disableFlightSync(fPlayer);
-                        }
-                    }
-
-                }
-            }
-
-        }, 20L, 20L);
-    }
-
-    public static boolean checkFly(FPlayer fme, Player me, Faction toFac) {
+    public static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac, boolean sendMessage) {
         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;
-        if (toFac.isSystemFaction()) return me.hasPermission(Permission.valueOf("FLY_" + ChatColor.stripColor(toFac.getTag()).toUpperCase()).node);
-        Relation relationTo = toFac.getRelationTo(fme.getFaction());
-        if (!relationTo.isEnemy() && !relationTo.isMember()) return me.hasPermission(Permission.valueOf("FLY_" + relationTo.name()).node);
-        return false;
-    }
 
+        if (toFac != fme.getFaction()) {
+            if (!me.hasPermission(Permission.FLY_WILDERNESS.node) && toFac.isWilderness() || !me.hasPermission(Permission.FLY_SAFEZONE.node) && toFac.isSafeZone() || !me.hasPermission(Permission.FLY_WARZONE.node) && toFac.isWarZone()) {
+                if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            Access access = toFac.getAccess(fme, PermissableAction.FLY);
+            if ((!(me.hasPermission(Permission.FLY_ENEMY.node) || access == Access.ALLOW)) && toFac.getRelationTo(fme.getFaction()) == Relation.ENEMY) {
+                if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            if (!(me.hasPermission(Permission.FLY_ALLY.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.ALLY) {
+                if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            if (!(me.hasPermission(Permission.FLY_TRUCE.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.TRUCE) {
+                if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
 
-    public static void checkTaskState() {
-        if (flyMap.isEmpty()) {
-            flyTask.cancel();
-            flyTask = null;
+            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
+                if (sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            return me.hasPermission(Permission.FLY_FLY.node) && (access != Access.DENY || toFac.isSystemFaction());
         }
+        return true;
     }
 
+
     public static void disableFlight(final FPlayer fme) {
         fme.setFlying(false);
         flyMap.remove(fme.getPlayer().getName());
     }
 
-    private static void disableFlightSync(FPlayer fme) {
-        Bukkit.getScheduler().runTask(FactionsPlugin.instance, () -> fme.setFFlying(false, false));
-        flyMap.remove(fme.getName());
-    }
 
     public boolean isInFlightChecker(Player player) {
         return flyMap.containsKey(player.getName());
     }
 
-    private static void checkEnemiesSync(FPlayer fp) {
-        Bukkit.getScheduler().runTask(FactionsPlugin.instance, fp::checkIfNearbyEnemies);
-    }
-
     @Override
     public void perform(CommandContext context) {
         if (!context.fPlayer.isAdminBypassing()) {
@@ -153,7 +120,7 @@ public class CmdFly extends FCommand {
 
             FLocation myfloc = new FLocation(context.player.getLocation());
             Faction toFac = Board.getInstance().getFactionAt(myfloc);
-            if (!checkFly(context.fPlayer, context.player, toFac)) {
+            if (!checkBypassPerms(context.fPlayer, context.player, toFac, false)) {
                 context.fPlayer.sendMessage(TL.COMMAND_FLY_NO_ACCESS.format(toFac.getTag()));
                 return;
             }
@@ -173,17 +140,15 @@ public class CmdFly extends FCommand {
             return;
         }
 
+        if (fme.canFlyAtLocation()) {
             context.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", () -> {
                 fme.setFlying(true);
                 flyMap.put(fme.getPlayer().getName(), true);
-                if (particleTask == null) {
-                    startParticles();
-                }
-
-                if (flyTask == null) {
-                    startFlyCheck();
-                }
+                if (particleTask == null) startParticles();
             }, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
+        } else {
+            fme.msg(TL.COMMAND_FLY_NO_ACCESS, Board.getInstance().getFactionAt(fme.getLastStoodAt()).getTag());
+        }
     }
 
     @Override

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

@@ -0,0 +1,44 @@
+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/CmdGetVault.java

@@ -2,10 +2,10 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.util.ItemBuilder;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Location;
 import org.bukkit.Material;
-import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
 public class CmdGetVault extends FCommand {
@@ -30,9 +30,13 @@ public class CmdGetVault extends FCommand {
             context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Vaults");
             return;
         }
-        Location vaultLocation = context.faction.getVault();
-        ItemStack vault = FactionsPlugin.getInstance().createItem(Material.CHEST, 1, (short) 0, FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fvault.Item.Name")), FactionsPlugin.getInstance().colorList(FactionsPlugin.getInstance().getConfig().getStringList("fvault.Item.Lore")));
 
+        Location vaultLocation = context.faction.getVault();
+        ItemStack vault = new ItemBuilder(Material.CHEST)
+                .amount(1)
+                .name(FactionsPlugin.getInstance().getConfig().getString("fvault.Item.Name"))
+                .lore(FactionsPlugin.getInstance().getConfig().getStringList("fvault.Item.Lore"))
+                .build();
 
         //check if vault is set
         if (vaultLocation != null) {
@@ -40,34 +44,19 @@ public class CmdGetVault extends FCommand {
             return;
         }
 
-
         //has enough money?
         int amount = FactionsPlugin.getInstance().getConfig().getInt("fvault.Price");
         if (!context.fPlayer.hasMoney(amount)) {
             return;
         }
 
-        if (!context.fPlayer.takeMoney(amount)) {return;}
-
         //success :)
+        context.fPlayer.takeMoney(amount);
         context.player.getInventory().addItem(vault);
         context.fPlayer.msg(TL.COMMAND_GETVAULT_RECEIVE);
 
     }
 
-    public boolean inventoryContains(Inventory inventory, ItemStack item) {
-        int count = 0;
-        ItemStack[] items = inventory.getContents();
-        for (int i = 0; i < items.length; i++) {
-            if (items[i] != null && items[i].getType() == item.getType() && items[i].getDurability() == item.getDurability()) {
-                count += items[i].getAmount();
-            }
-            if (count >= item.getAmount()) {
-                return true;
-            }
-        }
-        return false;
-    }
 
     @Override
     public TL getUsageTranslation() {

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

@@ -18,6 +18,7 @@ public class CmdHelp extends FCommand {
      */
 
     public ArrayList<ArrayList<String>> helpPages;
+
     //TODO: Add Help GUI
     public CmdHelp() {
         super();

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

@@ -1,5 +1,6 @@
 package com.massivecraft.factions.cmd;
 
+import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
@@ -21,6 +22,11 @@ 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/CmdInvite.java

@@ -9,7 +9,6 @@ import com.massivecraft.factions.util.CC;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
-import org.bukkit.ChatColor;
 
 public class CmdInvite extends FCommand {
 
@@ -60,14 +59,11 @@ public class CmdInvite extends FCommand {
         // Send the invitation to the target player when online, otherwise just ignore
         if (target.isOnline()) {
             // Tooltips, colors, and commands only apply to the string immediately before it.
-            FancyMessage message = new FancyMessage(context.fPlayer.describeTo(target, true))
+            FancyMessage message = new FancyMessage(TL.COMMAND_INVITE_INVITEDYOU.toString()
+                    .replace("%1$s", context.fPlayer.describeTo(target, true))
+                    .replace("%2$s", context.faction.getTag())
+                    .replaceAll("&", "§"))
                     .tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
-                    .command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag())
-                    .then(TL.COMMAND_INVITE_INVITEDYOU.toString())
-                    .color(ChatColor.YELLOW)
-                    .tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
-                    .command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag())
-                    .then(context.faction.describeTo(target)).tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
                     .command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag());
             message.send(target.getPlayer());
         }

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

@@ -1,25 +1,14 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
-import com.massivecraft.factions.cmd.audit.FLogType;
-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.fupgrades.UpgradeType;
+import com.massivecraft.factions.zcore.frame.fupgrades.UpgradeType;
 import com.massivecraft.factions.zcore.util.TL;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.exceptions.HierarchyException;
 import org.bukkit.Bukkit;
 
-import java.util.Objects;
-
 public class CmdJoin extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdJoin() {
         super();
         this.aliases.addAll(Aliases.join);
@@ -56,7 +45,7 @@ public class CmdJoin extends FCommand {
             return;
         }
 
-        if (Conf.factionMemberLimit > 0 && faction.getFPlayers().size() >= getFactionMemberLimit(faction)) {
+        if (!faction.altInvited(fplayer) && 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,32 +116,20 @@ 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");
-            if (Discord.useDiscord && context.fPlayer.discordSetup() && Discord.isInMainGuild(context.fPlayer.discordUser()) && Discord.mainGuild != null) {
-                Member m = Discord.mainGuild.getMember(context.fPlayer.discordUser());
-                if (Conf.factionRoles) {
-                    Discord.mainGuild.getController().addSingleRoleToMember(m, Objects.requireNonNull(Discord.createFactionRole(faction.getTag()))).queue();
-                }
-                if (Conf.factionDiscordTags) {
-                    Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
-                }
-            }
-        } catch (HierarchyException e) {System.out.print(e.getMessage());}
+        context.fPlayer.setRole(faction.getDefaultRole());
 
         if (Conf.logFactionJoin) {
             if (samePlayer) {
-                FactionsPlugin.getInstance().log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());
+                FactionsPlugin.instance.log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());
             } else {
-                FactionsPlugin.getInstance().log(TL.COMMAND_JOIN_MOVEDLOG.toString(), context.fPlayer.getName(), fplayer.getName(), faction.getTag());
+                FactionsPlugin.instance.log(TL.COMMAND_JOIN_MOVEDLOG.toString(), context.fPlayer.getName(), fplayer.getName(), faction.getTag());
             }
         }
     }
 
     private int getFactionMemberLimit(Faction f) {
         if (f.getUpgrade(UpgradeType.MEMBERS) == 0) return Conf.factionMemberLimit;
-        return Conf.factionMemberLimit + FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Members.Member-Boost.level-" + f.getUpgrade(UpgradeType.MEMBERS));
+        return Conf.factionMemberLimit + FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Members.Members-Limit.level-" + f.getUpgrade(UpgradeType.MEMBERS));
     }
 
     @Override

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

@@ -115,6 +115,7 @@ public class CmdKick extends FCommand {
         toKickFaction.msg(TL.COMMAND_KICK_FACTION, context.fPlayer.describeTo(toKickFaction, true), toKick.describeTo(toKickFaction, true));
 
         toKick.msg(TL.COMMAND_KICK_KICKED, context.fPlayer.describeTo(toKick, true), toKickFaction.describeTo(toKick));
+
         if (toKickFaction != context.faction) {
             context.fPlayer.msg(TL.COMMAND_KICK_KICKS, toKick.describeTo(context.fPlayer), toKickFaction.describeTo(context.fPlayer));
         }
@@ -127,6 +128,9 @@ public class CmdKick extends FCommand {
         FactionsPlugin.instance.logFactionEvent(toKickFaction, FLogType.INVITES, context.fPlayer.getName(), CC.Red + "kicked", toKick.getName());
         toKickFaction.deinvite(toKick);
         toKick.resetFactionData();
+        if (!CmdFly.checkBypassPerms(toKick, toKick.getPlayer(), toKickFaction, false)) {
+            CmdFly.disableFlight(toKick);
+        }
     }
 
     @Override

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

@@ -1,9 +1,7 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.ChatColor;
 
 public class CmdLeave extends FCommand {
 

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

@@ -42,76 +42,75 @@ public class CmdList extends FCommand {
         // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
         if (!context.payForCommand(Conf.econCostList, "to list the factions", "for listing the factions"))
             return;
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
 
-            ArrayList<Faction> factionList = Factions.getInstance().getAllFactions();
-            factionList.remove(Factions.getInstance().getWilderness());
-            factionList.remove(Factions.getInstance().getSafeZone());
-            factionList.remove(Factions.getInstance().getWarZone());
+        ArrayList<Faction> factionList = Factions.getInstance().getAllFactions();
+        factionList.remove(Factions.getInstance().getWilderness());
+        factionList.remove(Factions.getInstance().getSafeZone());
+        factionList.remove(Factions.getInstance().getWarZone());
 
-            // remove exempt factions
-            if (context.fPlayer != null && context.fPlayer.getPlayer() != null && !context.fPlayer.getPlayer().hasPermission("factions.show.bypassexempt")) {
-                List<String> exemptFactions = FactionsPlugin.getInstance().getConfig().getStringList("show-exempt");
+        // remove exempt factions
+        if (context.fPlayer != null && context.fPlayer.getPlayer() != null && !context.fPlayer.getPlayer().hasPermission("factions.show.bypassexempt")) {
+            List<String> exemptFactions = FactionsPlugin.getInstance().getConfig().getStringList("show-exempt");
 
-                factionList.removeIf(next -> exemptFactions.contains(next.getTag()));
+            factionList.removeIf(next -> exemptFactions.contains(next.getTag()));
+        }
+
+        // Sort by total followers first
+        factionList.sort((f1, f2) -> {
+            int f1Size = f1.getFPlayers().size();
+            int f2Size = f2.getFPlayers().size();
+            if (f1Size < f2Size) {
+                return 1;
+            } else if (f1Size > f2Size) {
+                return -1;
             }
-
-            // Sort by total followers first
-            factionList.sort((f1, f2) -> {
-                int f1Size = f1.getFPlayers().size();
-                int f2Size = f2.getFPlayers().size();
-                if (f1Size < f2Size) {
-                    return 1;
-                } else if (f1Size > f2Size) {
-                    return -1;
-                }
-                return 0;
-            });
-
-            // Then sort by how many members are online now
-            factionList.sort((f1, f2) -> {
-                int f1Size = f1.getFPlayersWhereOnline(true).size();
-                int f2Size = f2.getFPlayersWhereOnline(true).size();
-                if (f1Size < f2Size) {
-                    return 1;
-                } else if (f1Size > f2Size) {
-                    return -1;
-                }
-                return 0;
-            });
-
-            ArrayList<String> lines = new ArrayList<>();
-
-            factionList.add(0, Factions.getInstance().getWilderness());
-
-            final int pageheight = 9;
-            int pagenumber = context.argAsInt(0, 1);
-            int pagecount = (factionList.size() / pageheight) + 1;
-            if (pagenumber > pagecount) {
-                pagenumber = pagecount;
-            } else if (pagenumber < 1) {
-                pagenumber = 1;
-            }
-            int start = (pagenumber - 1) * pageheight;
-            int end = start + pageheight;
-            if (end > factionList.size()) {
-                end = factionList.size();
-            }
-
-
-            String header = FactionsPlugin.getInstance().getConfig().getString("list.header", defaults[0]);
-            header = header.replace("{pagenumber}", String.valueOf(pagenumber)).replace("{pagecount}", String.valueOf(pagecount));
-            lines.add(FactionsPlugin.getInstance().txt.parse(header));
-
-            for (Faction faction : factionList.subList(start, end)) {
-                if (faction.isWilderness()) {
-                    lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, FactionsPlugin.getInstance().getConfig().getString("list.factionless", defaults[1]))));
-                    continue;
-                }
-                lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, context.fPlayer, FactionsPlugin.getInstance().getConfig().getString("list.entry", defaults[2]))));
-            }
-            context.sendMessage(lines);
+            return 0;
         });
+
+        // Then sort by how many members are online now
+        factionList.sort((f1, f2) -> {
+            int f1Size = f1.getFPlayersWhereOnline(true).size();
+            int f2Size = f2.getFPlayersWhereOnline(true).size();
+            if (f1Size < f2Size) {
+                return 1;
+            } else if (f1Size > f2Size) {
+                return -1;
+            }
+            return 0;
+        });
+
+        ArrayList<String> lines = new ArrayList<>();
+
+        factionList.add(0, Factions.getInstance().getWilderness());
+
+        final int pageheight = 9;
+        int pagenumber = context.argAsInt(0, 1);
+        int pagecount = (factionList.size() / pageheight) + 1;
+        if (pagenumber > pagecount) {
+            pagenumber = pagecount;
+        } else if (pagenumber < 1) {
+            pagenumber = 1;
+        }
+        int start = (pagenumber - 1) * pageheight;
+        int end = start + pageheight;
+        if (end > factionList.size()) {
+            end = factionList.size();
+        }
+
+
+        String header = FactionsPlugin.getInstance().getConfig().getString("list.header", defaults[0]);
+        assert header != null;
+        header = header.replace("{pagenumber}", String.valueOf(pagenumber)).replace("{pagecount}", String.valueOf(pagecount));
+        lines.add(FactionsPlugin.getInstance().txt.parse(header));
+
+        for (Faction faction : factionList.subList(start, end)) {
+            if (faction.isWilderness()) {
+                lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, FactionsPlugin.getInstance().getConfig().getString("list.factionless", defaults[1]))));
+                continue;
+            }
+            lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, context.fPlayer, FactionsPlugin.getInstance().getConfig().getString("list.entry", defaults[2]))));
+        }
+        context.sendMessage(lines);
     }
 
     @Override

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

@@ -16,13 +16,13 @@ public class CmdLock extends FCommand {
 	description: use the /f lock [on/off] command to temporarily lock the data files from being overwritten
 	default: op
 	 */
-
     public CmdLock() {
         super();
         this.aliases.addAll(Aliases.lock);
         this.optionalArgs.put("on/off", "flip");
 
         this.requirements = new CommandRequirements.Builder(Permission.LOCK)
+                .noDisableOnLock()
                 .build();
     }
 

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

@@ -31,53 +31,57 @@ public class CmdMod extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-            FPlayer you = context.argAsBestFPlayerMatch(0);
-            if (you == null) {
-                FancyMessage msg = new FancyMessage(TL.COMMAND_MOD_CANDIDATES.toString()).color(ChatColor.GOLD);
-                for (FPlayer player : context.faction.getFPlayersWhereRole(Role.NORMAL)) {
-                    String s = player.getName();
-                    msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s).command("/" + Conf.baseCommandAliases.get(0) + " mod " + s);
-                }
-
-                context.sendFancyMessage(msg);
-                return;
+        FPlayer you = context.argAsBestFPlayerMatch(0);
+        if (you == null) {
+            FancyMessage msg = new FancyMessage(TL.COMMAND_MOD_CANDIDATES.toString()).color(ChatColor.GOLD);
+            for (FPlayer player : context.faction.getFPlayersWhereRole(Role.NORMAL)) {
+                String s = player.getName();
+                msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s).command("/" + Conf.baseCommandAliases.get(0) + " mod " + s);
             }
 
-            boolean permAny = Permission.MOD_ANY.has(context.sender, false);
-            Faction targetFaction = you.getFaction();
-            if (targetFaction != context.faction && !permAny) {
-                context.msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(context.fPlayer, true));
-                return;
-            }
+            context.sendFancyMessage(msg);
+            return;
+        }
 
-            if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
-                context.msg(TL.COMMAND_MOD_NOTADMIN);
-                return;
-            }
+        boolean permAny = Permission.MOD_ANY.has(context.sender, false);
+        Faction targetFaction = you.getFaction();
+        if (targetFaction != context.faction && !permAny) {
+            context.msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(context.fPlayer, true));
+            return;
+        }
 
-            if (you == context.fPlayer && !permAny) {
-                context.msg(TL.COMMAND_MOD_SELF);
-                return;
-            }
+        if (you.isAlt()) {
+            return;
+        }
 
-            if (you.getRole() == Role.LEADER) {
-                context.msg(TL.COMMAND_MOD_TARGETISADMIN);
-                return;
-            }
+        if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
+            context.msg(TL.COMMAND_MOD_NOTADMIN);
+            return;
+        }
 
-            if (you.getRole() == Role.MODERATOR) {
-                // Revoke
-                you.setRole(Role.NORMAL);
-                targetFaction.msg(TL.COMMAND_MOD_REVOKED, you.describeTo(targetFaction, true));
-                context.msg(TL.COMMAND_MOD_REVOKES, you.describeTo(context.fPlayer, true));
-            } else {
-                // Give
-                you.setRole(Role.MODERATOR);
-                targetFaction.msg(TL.COMMAND_MOD_PROMOTED, you.describeTo(targetFaction, true));
-                context.msg(TL.COMMAND_MOD_PROMOTES, you.describeTo(context.fPlayer, true));
-                FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.LIGHT_PURPLE + "Mod");
+        if (you == context.fPlayer && !permAny) {
+            context.msg(TL.COMMAND_MOD_SELF);
+            return;
+        }
 
-            }
+        if (you.getRole() == Role.LEADER) {
+            context.msg(TL.COMMAND_MOD_TARGETISADMIN);
+            return;
+        }
+
+        if (you.getRole() == Role.MODERATOR) {
+            // Revoke
+            you.setRole(Role.NORMAL);
+            targetFaction.msg(TL.COMMAND_MOD_REVOKED, you.describeTo(targetFaction, true));
+            context.msg(TL.COMMAND_MOD_REVOKES, you.describeTo(context.fPlayer, true));
+        } else {
+            // Give
+            you.setRole(Role.MODERATOR);
+            targetFaction.msg(TL.COMMAND_MOD_PROMOTED, you.describeTo(targetFaction, true));
+            context.msg(TL.COMMAND_MOD_PROMOTES, you.describeTo(context.fPlayer, true));
+            FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.LIGHT_PURPLE + "Mod");
+
+        }
     }
 
     @Override

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

@@ -0,0 +1,38 @@
+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,6 +6,7 @@ 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 {
@@ -38,12 +39,19 @@ 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/CmdPaypalSee.java

@@ -29,7 +29,6 @@ public class CmdPaypalSee extends FCommand {
         }
 
 
-
         if (context.args.size() == 0) {
             if (context.fPlayer.getFaction().getPaypal() == null) {
                 context.msg(TL.COMMAND_PAYPAL_NOTSET);

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

@@ -11,11 +11,15 @@ public class CmdPlayerTitleToggle extends FCommand {
         this.requirements = new CommandRequirements.Builder(Permission.TOGGLE_TITLES)
                 .build();
     }
+
     @Override
     public void perform(CommandContext context) {
         context.fPlayer.setTitlesEnabled(!context.fPlayer.hasTitlesEnabled());
         context.msg(TL.COMMAND_TITLETOGGLE_TOGGLED, context.fPlayer.hasTitlesEnabled() ? FactionsPlugin.getInstance().color("&dEnabled") : FactionsPlugin.getInstance().color("&dDisabled"));
     }
+
     @Override
-    public TL getUsageTranslation() {return TL.COMMAND_TITLETOGGLE_DESCRIPTION;}
+    public TL getUsageTranslation() {
+        return TL.COMMAND_TITLETOGGLE_DESCRIPTION;
+    }
 }

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

@@ -4,7 +4,6 @@ import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.discord.Discord;
 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;
 
@@ -26,15 +25,11 @@ public class CmdReload extends FCommand {
         long timeInitStart = System.currentTimeMillis();
         Conf.load();
         Conf.save();
-        ShopConfig.loadShop();
+        FactionsPlugin.getInstance().getFileManager().getShop().loadFile();
         FactionsPlugin.getInstance().reloadConfig();
         FactionsPlugin.getInstance().loadLang();
 
 
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
-            FactionsPlugin.getInstance().factionsFlight = true;
-        }
-
         if (!FactionsPlugin.getInstance().mc17) {
             FactionsPlayerListener.loadCorners();
         }

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

@@ -1,7 +1,6 @@
 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;
 
@@ -25,12 +24,13 @@ 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();
         }
-        ShopConfig.saveShop();
+        FactionsPlugin.getInstance().getFileManager().getShop().saveFile();
         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.Particles.ParticleEffect;
+import com.massivecraft.factions.util.ParticleEffect;
 import com.massivecraft.factions.util.VisualizeUtil;
 import com.massivecraft.factions.util.XMaterial;
 import com.massivecraft.factions.zcore.util.TL;
@@ -74,7 +74,9 @@ public class CmdSeeChunk extends FCommand {
             for (Object nameObject : seeChunkMap.keySet()) {
                 String name = nameObject + "";
                 Player player = Bukkit.getPlayer(name);
-                showBorders(player);
+                if (player != null) {
+                    showBorders(player);
+                }
             }
             manageTask();
         }, 0, interval);
@@ -110,24 +112,19 @@ public class CmdSeeChunk extends FCommand {
     private void showPillar(Player player, World world, int blockX, int blockZ) {
         for (int blockY = 0; blockY < player.getLocation().getBlockY() + 30; blockY++) {
             Location loc = new Location(world, blockX, blockY, blockZ).add(0.5, 0, 0.5);
-            if (loc.getBlock().getType() != Material.AIR) {
-                continue;
-            }
+            if (loc.getBlock().getType() != Material.AIR) continue;
             if (useParticles) {
                 if (FactionsPlugin.getInstance().useNonPacketParticles) {
                     // Dust options only exists in the 1.13 API, so we use an
                     // alternative method to achieve this in lower versions.
-                    if (FactionsPlugin.getInstance().mc113 || FactionsPlugin.getInstance().mc114) {
+                    if (FactionsPlugin.getInstance().mc113 || FactionsPlugin.getInstance().mc114 || FactionsPlugin.getInstance().mc115) {
                         player.spawnParticle(Particle.REDSTONE, loc, 0, new Particle.DustOptions(Color.RED, 1));
                     } else {
                         player.getWorld().spawnParticle(Particle.REDSTONE, loc, 0, 255, 0, 0, 1);
                     }
-
                 } else {
                     this.effect.display(0, 0, 0, 0, 1, loc, player);
                 }
-
-
             } else {
                 Material type = blockY % 5 == 0 ? XMaterial.REDSTONE_LAMP.parseMaterial() : XMaterial.BLACK_STAINED_GLASS.parseMaterial();
                 VisualizeUtil.addLocation(player, loc, type);

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

@@ -5,7 +5,7 @@ import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
-public class CmdSeeDiscord extends FCommand{
+public class CmdSeeDiscord extends FCommand {
 
     /**
      * @author Driftay
@@ -29,7 +29,6 @@ public class CmdSeeDiscord extends FCommand{
         }
 
 
-
         if (context.args.size() == 0) {
             if (context.fPlayer.getFaction().getDiscord() == null) {
                 context.msg(TL.COMMAND_DISCORD_NOTSET);

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

@@ -12,7 +12,7 @@ public class CmdSetDiscord extends FCommand {
      * @author Driftay
      */
 
-    public CmdSetDiscord(){
+    public CmdSetDiscord() {
         super();
         this.aliases.addAll(Aliases.discord_set);
 
@@ -64,7 +64,7 @@ public class CmdSetDiscord extends FCommand {
         }
     }
 
-    private boolean isDiscordInvite(String invite){
+    private boolean isDiscordInvite(String invite) {
         return invite.contains("discord.gg") || invite.contains("discord.me");
     }
 

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

@@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
 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;
 
@@ -43,6 +44,16 @@ public class CmdSethome extends FCommand {
                 return;
             }
 
+            if (!context.args.isEmpty()) {
+                Faction target = context.argAsFaction(0);
+                if (target == null) return;
+                context.faction = target;
+                if (target.getAccess(context.fPlayer, PermissableAction.SETHOME) != Access.ALLOW) {
+                    context.fPlayer.msg(TL.GENERIC_FPERM_NOPERMISSION, "set faction home");
+                    return;
+                }
+            }
+
             // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
             if (!context.payForCommand(Conf.econCostSethome, TL.COMMAND_SETHOME_TOSET, TL.COMMAND_SETHOME_FORSET)) {
                 return;

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

@@ -24,17 +24,21 @@ public class CmdShow extends FCommand {
         this.aliases.addAll(Aliases.show_show);
 
         // add defaults to /f show in case config doesnt have it
-        defaults.add("{header}");
-        defaults.add("<a>Description: <i>{description}");
-        defaults.add("<a>Joining: <i>{joining}    {peaceful}");
-        defaults.add("<a>Land / Power / Maxpower: <i> {chunks} / {power} / {maxPower}");
-        defaults.add("<a>Founded: <i>{create-date}");
-        defaults.add("<a>This faction is permanent, remaining even with no members.");
-        defaults.add("<a>Land value: <i>{land-value} {land-refund}");
-        defaults.add("<a>Balance: <i>{faction-balance}");
-        defaults.add("<a>Allies(<i>{allies}<a>/<i>{max-allies}<a>): {allies-list}");
-        defaults.add("<a>Online: (<i>{online}<a>/<i>{members}<a>): {online-list}");
-        defaults.add("<a>Offline: (<i>{offline}<a>/<i>{members}<a>): {offline-list}");
+        defaults.add("&8&m--------------&7 &8<&e{faction}&8> &8&m--------------");
+        defaults.add("&4* &cOwner: &f{leader}");
+        defaults.add("&4* &cDescription: &f{description}");
+        defaults.add("&4* &cLand / Power / Max Power: &f{chunks} &8/ &f{power} &8/ &f{maxPower}");
+        defaults.add("&4* &cFaction Strikes: &f{strikes}");
+        defaults.add("&4* &cFaction Points: &f{faction-points}");
+        defaults.add("&4* &cFounded: &f{create-date}");
+        defaults.add("&4* &cBalance: &f{faction-balance}");
+        defaults.add("&4* &cAllies: &a{allies-list}");
+        defaults.add("&4* &cEnemies: &4{enemies-list}");
+        defaults.add("&4* &cOnline Members: &8[&f{online}/{members}&8] &a{online-list}");
+        defaults.add("&4* &cOffline Members: &8[&f{offline}/{members}&8] &a{offline-list}");
+        defaults.add("&4* &cAlts: &f{alts}");
+        defaults.add("&4* &cBans: &f{faction-bancount}");
+        defaults.add("&8&m----------------------------------------");
 
         // this.requiredArgs.add("");
         this.optionalArgs.put("faction tag", "yours");
@@ -45,6 +49,7 @@ public class CmdShow extends FCommand {
     @Override
     public void perform(CommandContext context) {
         Faction faction = context.faction;
+        FactionsPlugin instance = FactionsPlugin.getInstance();
         if (context.argIsSet(0))
             faction = context.argAsFaction(0);
 
@@ -52,7 +57,7 @@ public class CmdShow extends FCommand {
             return;
 
         if (context.fPlayer != null && !context.player.getPlayer().hasPermission("factions.show.bypassexempt")
-                && FactionsPlugin.getInstance().getConfig().getStringList("show-exempt").contains(faction.getTag())) {
+                && instance.getConfig().getStringList("show-exempt").contains(faction.getTag())) {
             context.msg(TL.COMMAND_SHOW_EXEMPT);
             return;
         }
@@ -62,7 +67,7 @@ public class CmdShow extends FCommand {
             return;
         }
 
-        List<String> show = FactionsPlugin.getInstance().getConfig().getStringList("show");
+        List<String> show = instance.getConfig().getStringList("show");
         if (show == null || show.isEmpty())
             show = defaults;
 
@@ -71,41 +76,49 @@ public class CmdShow extends FCommand {
             // send header and that's all
             String header = show.get(0);
             if (TagReplacer.HEADER.contains(header)) {
-                context.msg(FactionsPlugin.getInstance().txt.titleize(tag));
+                context.msg(instance.txt.titleize(tag));
             } else {
-                context.msg(FactionsPlugin.getInstance().txt.parse(TagReplacer.FACTION.replace(header, tag)));
+                context.msg(instance.txt.parse(TagReplacer.FACTION.replace(header, tag)));
             }
             return; // we only show header for non-normal factions
         }
 
-        for (String raw : show) {
-            String parsed = TagUtil.parsePlain(faction, context.fPlayer, raw); // use relations
-            if (parsed == null) {
-                continue; // Due to minimal f show.
-            }
-
-            if (context.fPlayer != null) {
-                parsed = TagUtil.parsePlaceholders(context.fPlayer.getPlayer(), parsed);
-            }
-
-            if (TagUtil.hasFancy(parsed)) {
-                List<FancyMessage> fancy = TagUtil.parseFancy(faction, context.fPlayer, parsed);
-                if (fancy != null)
-                    context.sendFancyMessage(fancy);
-
-                continue;
-            }
-            if (!parsed.contains("{notFrozen}") && !parsed.contains("{notPermanent}")) {
-                if (parsed.contains("{ig}")) {
-                    // replaces all variables with no home TL
-                    parsed = parsed.substring(0, parsed.indexOf("{ig}")) + TL.COMMAND_SHOW_NOHOME.toString();
+        List<FancyMessage> fancy = new ArrayList<>();
+        List<String> finalShow = show;
+        Faction finalFaction = faction;
+        instance.getServer().getScheduler().runTaskAsynchronously(instance, () -> {
+            for (String raw : finalShow) {
+                String parsed = instance.getConfig().getBoolean("relational-show", true) ? TagUtil.parsePlain(finalFaction, context.fPlayer, raw) : TagUtil.parsePlain(finalFaction, raw); // use relations
+                if (parsed == null) {
+                    continue; // Due to minimal f show.
                 }
-                if (parsed.contains("%")) {
-                    parsed = parsed.replaceAll("%", ""); // Just in case it got in there before we disallowed it.
+
+                if (context.fPlayer != null) {
+                    parsed = TagUtil.parsePlaceholders(context.fPlayer.getPlayer(), parsed);
+                }
+
+                if (TagUtil.hasFancy(parsed)) {
+                    List<FancyMessage> localFancy = TagUtil.parseFancy(finalFaction, context.fPlayer, parsed);
+                    if (localFancy != null)
+                        fancy.addAll(localFancy);
+
+                    continue;
+                }
+                if (!parsed.contains("{notFrozen}") && !parsed.contains("{notPermanent}")) {
+                    if (parsed.contains("{ig}")) {
+                        // replaces all variables with no home TL
+                        parsed = parsed.substring(0, parsed.indexOf("{ig}")) + TL.COMMAND_SHOW_NOHOME.toString();
+                    }
+                    if (parsed.contains("%")) {
+                        parsed = parsed.replaceAll("%", ""); // Just in case it got in there before we disallowed it.
+                    }
+                    parsed = FactionsPlugin.getInstance().txt.parse(parsed);
+                    FancyMessage localFancy = instance.txt.parseFancy(parsed);
+                    fancy.add(localFancy);
                 }
-                context.msg(FactionsPlugin.getInstance().txt.parse(parsed));
             }
-        }
+            instance.getServer().getScheduler().runTask(instance, () -> context.sendFancyMessage(fancy));
+        });
     }
 
     @Override

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

@@ -4,6 +4,7 @@ import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.ListMultimap;
 import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdShowClaims extends FCommand {
@@ -16,6 +17,7 @@ public class CmdShowClaims extends FCommand {
         this.aliases.addAll(Aliases.show_claims);
 
         this.requirements = new CommandRequirements.Builder(Permission.SHOWCLAIMS)
+                .withAction(PermissableAction.TERRITORY)
                 .playerOnly()
                 .memberOnly()
                 .build();

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

@@ -3,7 +3,6 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
-import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
@@ -28,12 +27,13 @@ public class CmdShowInvites extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-            FancyMessage msg = new FancyMessage(TL.COMMAND_SHOWINVITES_PENDING.toString()).color(ChatColor.GOLD);
-            for (String id : context.faction.getInvites()) {
-                FPlayer fp = FPlayers.getInstance().getById(id);
-                String name = fp != null ? fp.getName() : id;
-                msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_SHOWINVITES_CLICKTOREVOKE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
-            }
+        FancyMessage msg = new FancyMessage(TL.COMMAND_SHOWINVITES_PENDING.toString()).color(ChatColor.GOLD);
+        for (String id : context.faction.getInvites()) {
+            FPlayer fp = FPlayers.getInstance().getById(id);
+            String name = fp != null ? fp.getName() : id;
+            msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_SHOWINVITES_CLICKTOREVOKE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
+        }
+        context.sendFancyMessage(msg);
     }
 
     @Override

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

@@ -11,7 +11,7 @@ public class CmdSpawnerLock extends FCommand {
      * @author Illyria Team
      */
 
-    public CmdSpawnerLock(){
+    public CmdSpawnerLock() {
         super();
         this.aliases.addAll(Aliases.spawnerlock);
 
@@ -20,7 +20,7 @@ public class CmdSpawnerLock extends FCommand {
     }
 
     @Override
-    public void perform(CommandContext context){
+    public void perform(CommandContext context) {
         Conf.spawnerLock = !Conf.spawnerLock;
         context.msg(TL.COMMAND_SPAWNER_LOCK_TOGGLED, Conf.spawnerLock ? FactionsPlugin.getInstance().color("&aEnabled") : FactionsPlugin.getInstance().color("&4Disabled"));
     }

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

@@ -1,5 +1,6 @@
 package com.massivecraft.factions.cmd;
 
+import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
@@ -19,6 +20,12 @@ public class CmdStealth extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
+        if (!Conf.useStealthSystem) {
+            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,6 +35,12 @@ 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,6 +7,7 @@ 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;
@@ -34,56 +35,64 @@ public class CmdTag extends FCommand {
     @Override
     public void perform(CommandContext context) {
 
-            String tag = context.argAsString(0);
+        String tag = context.argAsString(0);
 
-            // TODO does not first test cover selfcase?
-            if (Factions.getInstance().isTagTaken(tag) && !MiscUtil.getComparisonString(tag).equals(context.faction.getComparisonTag())) {
-                context.msg(TL.COMMAND_TAG_TAKEN);
-                return;
+        // TODO does not first test cover selfcase?
+        if (Factions.getInstance().isTagTaken(tag) && !MiscUtil.getComparisonString(tag).equals(context.faction.getComparisonTag())) {
+            context.msg(TL.COMMAND_TAG_TAKEN);
+            return;
+        }
+
+        ArrayList<String> errors = MiscUtil.validateTag(tag);
+        if (errors.size() > 0) {
+            context.sendMessage(errors);
+            return;
+        }
+
+        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
+        if (!context.canAffordCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE.toString())) {
+            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);
+        if (renameEvent.isCancelled()) {
+            return;
+        }
+
+        // then make 'em pay (if applicable)
+        if (!context.payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) {
+            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);
+
+
+        // Inform
+        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;
             }
-
-            ArrayList<String> errors = MiscUtil.validateTag(tag);
-            if (errors.size() > 0) {
-                context.sendMessage(errors);
-                return;
+            // Broadcast the tag change (if applicable)
+            if (Conf.broadcastTagChanges) {
+                Faction faction = fplayer.getFaction();
+                fplayer.msg(TL.COMMAND_TAG_CHANGED, context.fPlayer.getColorTo(faction) + oldtag, context.faction.getTag(faction));
             }
-
-            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
-            if (!context.canAffordCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE.toString())) {
-                return;
-            }
-
-            // trigger the faction rename event (cancellable)
-            FactionRenameEvent renameEvent = new FactionRenameEvent(context.fPlayer, tag);
-            Bukkit.getServer().getPluginManager().callEvent(renameEvent);
-            if (renameEvent.isCancelled()) {
-                return;
-            }
-
-            // then make 'em pay (if applicable)
-            if (!context.payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) {
-                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);
-
-
-            // Inform
-            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));
-                    continue;
-                }
-                // Broadcast the tag change (if applicable)
-                if (Conf.broadcastTagChanges) {
-                    Faction faction = fplayer.getFaction();
-                    fplayer.msg(TL.COMMAND_TAG_CHANGED, context.fPlayer.getColorTo(faction) + oldtag, context.faction.getTag(faction));
-                }
-            }
-            FTeamWrapper.updatePrefixes(context.faction);
+        }
+        FTeamWrapper.updatePrefixes(context.faction);
     }
 
     @Override

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.listeners.FactionsBlockListener;
-import com.massivecraft.factions.listeners.FactionsPlayerListener;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.util.WarmUpUtil;
 import com.massivecraft.factions.zcore.util.TL;

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

@@ -48,7 +48,7 @@ public class CmdUnban extends FCommand {
         context.faction.unban(target);
 
         context.msg(TL.COMMAND_UNBAN_UNBANNED, context.fPlayer.getName(), target.getName());
-        target.msg(TL.COMMAND_UNBAN_TARGET, context.faction.getTag(target));
+        target.msg(TL.COMMAND_UNBAN_TARGETUNBANNED, context.faction.getTag(target));
     }
 
     @Override

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.fupgrades.FUpgradeFrame;
+import com.massivecraft.factions.zcore.frame.fupgrades.FUpgradeFrame;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdUpgrades extends FCommand {

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

@@ -8,7 +8,6 @@ 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;
@@ -27,6 +26,7 @@ import com.massivecraft.factions.discord.CmdInviteBot;
 import com.massivecraft.factions.discord.CmdSetGuild;
 import com.massivecraft.factions.missions.CmdMissions;
 import com.massivecraft.factions.shop.CmdShop;
+import com.massivecraft.factions.shop.ShopGUIFrame;
 import com.massivecraft.factions.zcore.util.TL;
 import me.lucko.commodore.CommodoreProvider;
 import org.bukkit.Bukkit;
@@ -156,7 +156,6 @@ 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();
@@ -168,6 +167,11 @@ 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;
@@ -184,6 +188,7 @@ 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();
@@ -212,6 +217,7 @@ 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);
@@ -262,6 +268,7 @@ 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);
@@ -292,13 +299,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();
     }
@@ -308,16 +315,16 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
      */
     public void addVariableCommands() {
         //Discord
-         if (Conf.useDiscordSystem && !discordEnabled) {
-             this.addSubCommand(this.cmdInviteBot);
-             this.addSubCommand(this.cmdSetGuild);
-             this.addSubCommand(this.cmdSetDiscord);
-             this.addSubCommand(this.cmdSeeDiscord);
-             this.addSubCommand(this.cmdDiscord);
-             discordEnabled = true;
-         }
-         //Reserve
-        if(Conf.useReserveSystem){
+        if (Conf.useDiscordSystem && !discordEnabled) {
+            this.addSubCommand(this.cmdInviteBot);
+            this.addSubCommand(this.cmdSetGuild);
+            this.addSubCommand(this.cmdSetDiscord);
+            this.addSubCommand(this.cmdSeeDiscord);
+            this.addSubCommand(this.cmdDiscord);
+            discordEnabled = true;
+        }
+        //Reserve
+        if (Conf.useReserveSystem) {
             this.addSubCommand(this.cmdReserve);
         }
 
@@ -350,11 +357,16 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
             internalFTOPEnabled = true;
         }
 
-        if(Conf.useAuditSystem){
+        if (Conf.useAuditSystem) {
             this.addSubCommand(cmdAudit);
             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);
@@ -366,6 +378,7 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
         }
         if (FactionsPlugin.getInstance().getConfig().getBoolean("F-Shop.Enabled", false) && !fShopEnabled) {
             this.addSubCommand(this.cmdShop);
+            new ShopGUIFrame(null).checkShopConfig();
             fShopEnabled = true;
         }
         if (FactionsPlugin.getInstance().getConfig().getBoolean("f-inventory-see.Enabled", false) && !invSeeEnabled) {
@@ -388,13 +401,15 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
             addSubCommand(this.cmdFocus);
             fFocusEnabled = true;
         }
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false) && !fFlyEnabled) {
+        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", true) && !fFlyEnabled) {
             this.addSubCommand(this.cmdFly);
             fFlyEnabled = true;
         }
     }
 
-    public void rebuild() {if (CommodoreProvider.isSupported()) brigadierManager.build();}
+    public void rebuild() {
+        if (CommodoreProvider.isSupported()) brigadierManager.build();
+    }
 
     @Override
     public void perform(CommandContext context) {

src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java

@@ -25,7 +25,7 @@ public class CmdKickAlt extends FCommand {
      * @author Driftay
      */
 
-    public CmdKickAlt(){
+    public CmdKickAlt() {
         super();
         this.aliases.addAll(Aliases.alts_kick);
         this.requiredArgs.add("player name");
@@ -86,7 +86,7 @@ public class CmdKickAlt extends FCommand {
         // This statement allows us to check if they've specifically denied it,
         // or default to
         // the old setting of allowing moderators to kick
-        if (access !=  Access.ALLOW && !context.assertMinRole(Role.MODERATOR)) {
+        if (access != Access.ALLOW && !context.assertMinRole(Role.MODERATOR)) {
             context.msg(TL.GENERIC_NOPERMISSION, "kick");
             return;
         }

src/main/java/com/massivecraft/factions/cmd/audit/CmdAudit.java

@@ -26,10 +26,11 @@ public class CmdAudit extends FCommand {
                 .noErrorOnManyArgs()
                 .build();
     }
+
     @Override
     public void perform(CommandContext context) {
         Faction faction = context.args.size() == 1 && context.sender.isOp() ? context.argAsFaction(0) : context.faction;
-        new FAuditMenu((Player)context.sender, faction).open((Player)context.sender);
+        new FAuditMenu((Player) context.sender, faction).open((Player) context.sender);
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/audit/FAuditMenu.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.audit;
 /*
   @author Saser
  */
+
 import com.google.common.collect.Lists;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
@@ -92,9 +93,9 @@ public class FAuditMenu extends GUIMenu {
                 LinkedList<FactionLogs.FactionLog> log = logs.getMostRecentLogs().get(logType);
                 if (log != null) {
                     int slot = logType == FLogType.F_TNT ? 0 : 3;
-                    int pagesToShow = (int)Math.max(1.0D, Math.ceil((double)log.size() / (double)perPage));
+                    int pagesToShow = (int) Math.max(1.0D, Math.ceil((double) log.size() / (double) perPage));
 
-                    for(int page = 1; page <= pagesToShow; ++page) {
+                    for (int page = 1; page <= pagesToShow; ++page) {
                         int startIndex = log.size() - (page * perPage - perPage);
                         if (startIndex >= log.size()) {
                             startIndex = log.size() - 1;
@@ -102,7 +103,7 @@ public class FAuditMenu extends GUIMenu {
 
                         List<String> lore = Lists.newArrayList("", CC.GreenB + "Logs");
 
-                        for(int i = startIndex; i > startIndex - perPage; --i) {
+                        for (int i = startIndex; i > startIndex - perPage; --i) {
                             if (i < log.size()) {
                                 if (i < 0) {
                                     break;

src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.audit;
 /**
  * @author Saser
  */
+
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
@@ -45,17 +46,20 @@ public class FChestListener implements Listener {
         Player player = (Player) event.getWhoClicked();
         FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
         Faction faction;
-        if(!event.getView().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title")))) return;
+        if (!event.getView().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"))))
+            return;
         if (event.getClick() == ClickType.UNKNOWN) {
             event.setCancelled(true);
             player.sendMessage(CC.RedB + "(!) " + CC.Red + "You cannot use that click type inside the /f chest!");
             return;
         }
         ItemStack currentItem = event.getCurrentItem();
-        if (event.getClick() == ClickType.NUMBER_KEY) currentItem = event.getClickedInventory().getItem(event.getSlot());
+        if (event.getClick() == ClickType.NUMBER_KEY)
+            currentItem = event.getClickedInventory().getItem(event.getSlot());
         Material currentItemType = currentItem != null ? currentItem.getType() : Material.AIR;
         ItemStack cursorItem = event.getCursor();
-        if (event.getClick() == ClickType.NUMBER_KEY) cursorItem = player.getInventory().getItem(event.getHotbarButton());
+        if (event.getClick() == ClickType.NUMBER_KEY)
+            cursorItem = player.getInventory().getItem(event.getHotbarButton());
         Material cursorItemType = cursorItem != null ? cursorItem.getType() : Material.AIR;
         if (fPlayer == null || !(faction = fPlayer.getFaction()).isNormal()) {
             player.closeInventory();
@@ -65,16 +69,16 @@ public class FChestListener implements Listener {
         if (event.getClickedInventory() == null) return;
         if (event.getView().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"))) && !event.getClick().isShiftClick()) {
             if (currentItemType != Material.AIR) {
-                    Inventory ours = faction.getChestInventory();
-                    if(event.getClickedInventory() == ours) {
-                        if (ours == null || !ours.contains(currentItem)) {
-                            event.setCancelled(true);
-                            player.sendMessage(CC.RedB + "(!) That item not longer exists!");
-                            Bukkit.getLogger().info("[FactionChest] " + player.getName() + " tried to remove " + currentItem + " from /f chest when it didnt contain! Items: " + (ours == null ? "none" : Arrays.toString(ours.getContents())));
-                            player.closeInventory();
-                            return;
-                        }
+                Inventory ours = faction.getChestInventory();
+                if (event.getClickedInventory() == ours) {
+                    if (ours == null || !ours.contains(currentItem)) {
+                        event.setCancelled(true);
+                        player.sendMessage(CC.RedB + "(!) That item not longer exists!");
+                        Bukkit.getLogger().info("[FactionChest] " + player.getName() + " tried to remove " + currentItem + " from /f chest when it didnt contain! Items: " + (ours == null ? "none" : Arrays.toString(ours.getContents())));
+                        player.closeInventory();
+                        return;
                     }
+                }
                 logRemoveItem(currentItem, fPlayer, player);
             } else if (cursorItemType != Material.AIR && !event.isShiftClick()) {
                 logAddItem(cursorItem, fPlayer, player);