Merge branch 'develop' into project-cosmetics

Conflicts: Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilItem.java Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatLovestruck.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/hat/HatSecretPackage.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleCoalFumes.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleEnchant.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleFrostLord.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleGreen.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHeart.java Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/particle/ParticleHelix.java
2016-02-20 15:30:26 +01:00 · 2016-02-20 15:30:26 +01:00 · 33b3d121b3
commit 33b3d121b3
parent 85b8937801 35b9e01aff
548 changed files with 12115 additions and 5517 deletions
--- a/.gitignore
+++ b/.gitignore
@ -55,3 +55,14 @@ zSotanna2
 /.recommenders/index/http___download_eclipse_org_recommenders_models_mars_
 /RemoteSystemsTempFiles
 /.recommenders/caches
+
+target/
+
+# IntelliJ IDEA Files
+*.iml
+.idea/
+
+# Eclipse
+.settings/
+.classpath
+.project
--- a/Patches/Bukkit-Patches/0001-Update-groupId.patch
+++ b/Patches/Bukkit-Patches/0001-Update-groupId.patch
@ -0,0 +1,22 @@
+From b3604650ac6e2813f9e1b4d54862ce79c37e001e Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Mon, 15 Feb 2016 09:39:33 +1100
+Subject: [PATCH] Update groupId
+
+
+diff --git a/pom.xml b/pom.xml
+index cb142f2..378fd01 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -9,7 +9,7 @@
+         <version>9</version>
+     </parent>
+ 
+-    <groupId>org.spigotmc</groupId>
+    <groupId>com.mineplex</groupId>
+     <artifactId>spigot-api</artifactId>
+     <version>1.8.8-R0.1-SNAPSHOT</version>
+     <packaging>jar</packaging>
+-- 
+2.5.0
+
--- a/Patches/Bukkit-Patches/0002-LivingEntity-changes.patch
+++ b/Patches/Bukkit-Patches/0002-LivingEntity-changes.patch
@ -1,4 +1,4 @@
-From f037882f13b3ea9d0a0137260e365a4332a8e751 Mon Sep 17 00:00:00 2001
+From 41b16c2e04b2bc8ada5d0ed363e4ea5e6b466ee1 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 23 Oct 2015 21:23:18 +1300
 Subject: [PATCH] LivingEntity changes
@ -30,5 +30,5 @@ index 48e2508..fb623ae 100644
 +    public void setGhost(boolean ghost);
 }
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/Bukkit-Patches/0003-EntityDismountEvent.patch
+++ b/Patches/Bukkit-Patches/0003-EntityDismountEvent.patch
@ -1,4 +1,4 @@
-From c6e51ae8ffc31d0fc059d33ca159df31c2b7a83e Mon Sep 17 00:00:00 2001
+From 1bb1629f460d9c8ababad25722bebd0fedf2b269 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Sun, 22 Nov 2015 14:37:11 +1300
 Subject: [PATCH] EntityDismountEvent
@ -43,5 +43,5 @@ index 24d4942..02943d6 100644
 +
 }
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0001-Update-groupId.patch
+++ b/Patches/CraftBukkit-Patches/0001-Update-groupId.patch
@ -0,0 +1,31 @@
+From 409122f500f205b8a9b0fdec56900d83cee9f1ba Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Mon, 15 Feb 2016 09:56:14 +1100
+Subject: [PATCH] Update groupId
+
+
+diff --git a/pom.xml b/pom.xml
+index 91627ff..c1d1fb7 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -1,7 +1,7 @@
+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+     <modelVersion>4.0.0</modelVersion>
+-    <groupId>org.spigotmc</groupId>
+    <groupId>com.mineplex</groupId>
+     <artifactId>spigot</artifactId>
+     <packaging>jar</packaging>
+     <version>1.8.8-R0.1-SNAPSHOT</version>
+@@ -34,7 +34,7 @@
+             <version>3.0.3</version>
+         </dependency>
+         <dependency>
+-            <groupId>org.spigotmc</groupId>
+            <groupId>com.mineplex</groupId>
+             <artifactId>spigot-api</artifactId>
+             <version>${project.version}</version>
+             <type>jar</type>
+-- 
+2.5.0
+
--- a/Patches/CraftBukkit-Patches/0002-Modify-packets-to-public.patch
+++ b/Patches/CraftBukkit-Patches/0002-Modify-packets-to-public.patch
@ -1,4 +1,4 @@
-From b9014b76bbb262a39ce2d70cbe831ceb07acf68d Mon Sep 17 00:00:00 2001
+From 687c7ed26e1733b8ed688243cd6df91c45db148a Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 23 Oct 2015 21:14:50 +1300
 Subject: [PATCH] Modify packets to public
@ -2033,5 +2033,5 @@ index 0000000..4c2705b
 +}
 \ No newline at end of file
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0003-Modifiy-entity.patch
+++ b/Patches/CraftBukkit-Patches/0003-Modifiy-entity.patch
@ -1,4 +1,4 @@
-From 9f12f0f7abe2a94fe4a724a7c17245b9c0f33a70 Mon Sep 17 00:00:00 2001
+From ca990c7ca61006f0933d0e117f1003822b887667 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 23 Oct 2015 21:16:07 +1300
 Subject: [PATCH] Modifiy entity
@ -677,7 +677,7 @@ index a8a327d..b7647bc 100644
             this.bp = null;
             if (!this.world.isClientSide && flag1) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 3c852fd..b861dbe 100644
+index f643b29..f75b0b1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -101,6 +101,18 @@ public abstract class EntityLiving extends Entity {
@ -699,7 +699,7 @@ index 3c852fd..b861dbe 100644
     public EntityLiving(World world) {
         super(world);
         this.initAttributes();
-@@ -1783,7 +1795,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1784,7 +1796,7 @@ public abstract class EntityLiving extends Entity {
     }
 
     public boolean ad() {
@ -800,5 +800,5 @@ index 5317cff..60e8584 100644
         return Math.min(Math.max(0, getHandle().getHealth()), getMaxHealth());
     }
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0004-Chunk-changes.patch
+++ b/Patches/CraftBukkit-Patches/0004-Chunk-changes.patch
@ -1,4 +1,4 @@
-From 71c20f9d0c8bfa388f6bf0ba1a7b765a83e9de2a Mon Sep 17 00:00:00 2001
+From c8c2e86ef3ac3baf774afacf5fe2fab0b39a39a6 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 23 Oct 2015 21:21:32 +1300
 Subject: [PATCH] Chunk changes
@ -231,5 +231,5 @@ index 975d666..a55bd6c 100644
                 /*
                  * If it's a new world, the first few chunks are generated inside
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0005-Packet-listener-changes.patch
+++ b/Patches/CraftBukkit-Patches/0005-Packet-listener-changes.patch
@ -1,4 +1,4 @@
-From 47c08a6099856faf0049c0b0cdde495a8ae4166e Mon Sep 17 00:00:00 2001
+From 04418c14f74d251cebe99e4bc6315d619b0a4440 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 23 Oct 2015 21:22:05 +1300
 Subject: [PATCH] Packet listener changes
@ -349,5 +349,5 @@ index 5740e49..5edef3e 100644
 
     public void a(PacketPlayInWindowClick packetplayinwindowclick) {
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0006-Inventory-changes.patch
+++ b/Patches/CraftBukkit-Patches/0006-Inventory-changes.patch
@ -0,0 +1,70 @@
+From 413c649570b54e6d7a50da7aa888cfb20018f523 Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Fri, 23 Oct 2015 21:22:36 +1300
+Subject: [PATCH] Inventory changes
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
+index e99b8cc..428836c 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
+@@ -32,7 +32,7 @@ public class CraftInventoryCustom extends CraftInventory {
+         super(new MinecraftInventory(owner, size, title));
+     }
+ 
+-    static class MinecraftInventory implements IInventory {
+    public static class MinecraftInventory implements IInventory {
+         private final ItemStack[] items;
+         private int maxStack = MAX_STACK;
+         private final List<HumanEntity> viewers;
+diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+index 23f05f4..fdaf026 100644
+--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
+@@ -26,7 +26,7 @@ import net.minecraft.server.NBTTagString;
+ import org.bukkit.craftbukkit.util.CraftChatMessage;
+ 
+ @DelegateDeserialization(ItemStack.class)
+-public final class CraftItemStack extends ItemStack {
+public class CraftItemStack extends ItemStack {
+ 
+     public static net.minecraft.server.ItemStack asNMSCopy(ItemStack original) {
+         if (original instanceof CraftItemStack) {
+@@ -95,26 +95,30 @@ public final class CraftItemStack extends ItemStack {
+     /**
+      * Mirror
+      */
+-    private CraftItemStack(net.minecraft.server.ItemStack item) {
+    protected CraftItemStack(net.minecraft.server.ItemStack item) {
+         this.handle = item;
+     }
+ 
+-    private CraftItemStack(ItemStack item) {
+    protected CraftItemStack(ItemStack item) {
+         this(item.getTypeId(), item.getAmount(), item.getDurability(), item.hasItemMeta() ? item.getItemMeta() : null);
+     }
+ 
+-    private CraftItemStack(Material type, int amount, short durability, ItemMeta itemMeta) {
+    protected CraftItemStack(Material type, int amount, short durability, ItemMeta itemMeta) {
+         setType(type);
+         setAmount(amount);
+         setDurability(durability);
+         setItemMeta(itemMeta);
+     }
+ 
+-    private CraftItemStack(int typeId, int amount, short durability, ItemMeta itemMeta) {
+    protected CraftItemStack(int typeId, int amount, short durability, ItemMeta itemMeta) {
+         this(Material.getMaterial(typeId), amount, durability, itemMeta);
+ 
+     }
+ 
+    public net.minecraft.server.ItemStack getHandle() {
+        return handle;
+    }
+
+     @Override
+     public int getTypeId() {
+         return handle != null ? CraftMagicNumbers.getId(handle.getItem()) : 0;
+-- 
+2.5.0
+
--- a/Patches/CraftBukkit-Patches/0007-Misc-changes.patch
+++ b/Patches/CraftBukkit-Patches/0007-Misc-changes.patch
@ -1,4 +1,4 @@
-From 088fc9372c061edac80ee5cce669382ebed0b1e3 Mon Sep 17 00:00:00 2001
+From 7772a2a9b83ee223c01ac2003ba32a1b95a7c0cd Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 23 Oct 2015 21:23:00 +1300
 Subject: [PATCH] Misc changes
@ -273,5 +273,5 @@ index 29082aa..e979f69 100644
         }
 
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0008-EntityGuardian-is-now-vegetateable.patch
+++ b/Patches/CraftBukkit-Patches/0008-EntityGuardian-is-now-vegetateable.patch
@ -1,4 +1,4 @@
-From 9aded83bc47bf6ba8076fc2ed03ebbe480df1296 Mon Sep 17 00:00:00 2001
+From 969a70f201e6eda7d990e11e292e0dacc35f8ddf Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Wed, 28 Oct 2015 09:00:24 +1300
 Subject: [PATCH] EntityGuardian is now vegetateable
@ -601,5 +601,5 @@ index 0000000..c14caf2
 +    public PathfinderGoalRandomStroll goalRandomStroll;
 +}
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0009-Controller-look-vegetateHead-Entity-collide-changes.patch
+++ b/Patches/CraftBukkit-Patches/0009-Controller-look-vegetateHead-Entity-collide-changes.patch
@ -1,4 +1,4 @@
-From d3b44ea22080f4d15bf45b74b46b989b29f7b039 Mon Sep 17 00:00:00 2001
+From a48503259a76ca5b9fec3bd7ec06e0e5c1d3f8e1 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 30 Oct 2015 20:02:58 +1300
 Subject: [PATCH] Controller look vegetateHead, Entity collide changes
@ -39,5 +39,5 @@ index cb9ba53..8660762 100644
                 double d0 = entity.locX - this.locX;
                 double d1 = entity.locZ - this.locZ;
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0010-Vegetate-head-ai.patch
+++ b/Patches/CraftBukkit-Patches/0010-Vegetate-head-ai.patch
@ -1,4 +1,4 @@
-From a793ae3653b54c211b2c40147e031449d3e1cf72 Mon Sep 17 00:00:00 2001
+From bafc21b97584c9207f29804520942285752d6b53 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Tue, 3 Nov 2015 21:21:02 +1300
 Subject: [PATCH] Vegetate head ai
@ -95,7 +95,7 @@ index b7647bc..c2ef000 100644
         this.yaw = this.b(this.yaw, f2, f);
     }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b861dbe..4de7e4c 100644
+index f75b0b1..e384c2c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -113,6 +113,18 @@ public abstract class EntityLiving extends Entity {
@ -135,5 +135,5 @@ index b861dbe..4de7e4c 100644
         } else if (!this.bM()) {
             this.motX *= 0.98D;
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0011-Modifications-to-cb.patch
+++ b/Patches/CraftBukkit-Patches/0011-Modifications-to-cb.patch
@ -1,4 +1,4 @@
-From afb13529d05ad4adb0afa8cf8430e942d3e65e90 Mon Sep 17 00:00:00 2001
+From 5e1591dec2adb9001c9c3aafd0908d95eadff484 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Sun, 8 Nov 2015 17:57:05 +1300
 Subject: [PATCH] Modifications to cb
@ -104,7 +104,7 @@ index c2ef000..b7647bc 100644
         this.yaw = this.b(this.yaw, f2, f);
     }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4de7e4c..b861dbe 100644
+index e384c2c..f75b0b1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -113,18 +113,6 @@ public abstract class EntityLiving extends Entity {
@ -1614,5 +1614,5 @@ index 0000000..fdf0e10
 +    }
 +}
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0012-Add-IEntitySelector-have-isGhost-return-the-same-as-.patch
+++ b/Patches/CraftBukkit-Patches/0012-Add-IEntitySelector-have-isGhost-return-the-same-as-.patch
@ -1,4 +1,4 @@
-From cddf775b575f0db92e478c858283869ac0b9bdc2 Mon Sep 17 00:00:00 2001
+From d57744e41ed408a6f924665509bb03fac0590cfa Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Mon, 9 Nov 2015 00:07:26 +1300
 Subject: [PATCH] Add IEntitySelector, have isGhost() return the same as
@ -115,5 +115,5 @@ index 0000000..1536600
 +
 +}
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0013-Add-player-spectator.patch
+++ b/Patches/CraftBukkit-Patches/0013-Add-player-spectator.patch
@ -1,4 +1,4 @@
-From e81762b9aa4f28474b2ccd06ae6ad5b7c840e1ba Mon Sep 17 00:00:00 2001
+From c6967f167cb74718389c7d87a0e4847d2824e855 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Mon, 9 Nov 2015 00:13:21 +1300
 Subject: [PATCH] Add player spectator
@ -18,5 +18,5 @@ index 1536600..f86cf48 100644
 
         public boolean apply(Object obj)
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0014-Fixed-ai-typo.patch
+++ b/Patches/CraftBukkit-Patches/0014-Fixed-ai-typo.patch
@ -1,4 +1,4 @@
-From 5dac54f90504022449cbd5ea23e5306f17523fe2 Mon Sep 17 00:00:00 2001
+From 9eb0754b8eaed3dd60355206dd53c6b4dacab361 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Mon, 9 Nov 2015 02:41:31 +1300
 Subject: [PATCH] Fixed ai typo
@ -18,5 +18,5 @@ index f86cf48..b4d70ad 100644
 
         public boolean apply(Object obj)
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0015-Fix-casting-bug.patch
+++ b/Patches/CraftBukkit-Patches/0015-Fix-casting-bug.patch
@ -1,4 +1,4 @@
-From ea74383b4c0f5160f0d890d9377bd0d72e31db0c Mon Sep 17 00:00:00 2001
+From d37159de8e6c19ed8e232666661572cc399dc82a Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Wed, 11 Nov 2015 00:21:54 +1300
 Subject: [PATCH] Fix casting bug
@ -60,5 +60,5 @@ index 60e8584..746961e 100644
 
     public boolean isGhost()
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0016-Fix-schedulers.patch
+++ b/Patches/CraftBukkit-Patches/0016-Fix-schedulers.patch
@ -1,4 +1,4 @@
-From 896df3218cf190a29901619e762b5399517dbfbd Mon Sep 17 00:00:00 2001
+From c881d98fee52e719e60a5c8f5eeb9497357dd597 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Wed, 11 Nov 2015 11:43:17 +1300
 Subject: [PATCH] Fix schedulers
@ -33,5 +33,5 @@ index 1d29ae7..55e2afd 100644
         SpigotTimings.processQueueTimer.startTiming(); // Spigot
         while (!processQueue.isEmpty()) {
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0017-EntityDismountEvent-teleport-crash-fix.patch
+++ b/Patches/CraftBukkit-Patches/0017-EntityDismountEvent-teleport-crash-fix.patch
@ -1,37 +1,27 @@
-From bc86c3b02f2efa4c1194fc908e8d1ee8723f62c5 Mon Sep 17 00:00:00 2001
+From b0eb73047d9e8e06c2822142dc8c443efa9eda2e Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Sun, 22 Nov 2015 14:41:11 +1300
 Subject: [PATCH] EntityDismountEvent & teleport crash fix


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 81ca499..7165579 100644
+index 81ca499..2a4f819 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -23,6 +23,8 @@ import org.bukkit.event.painting.PaintingBreakByEntityEvent;
- import org.bukkit.event.vehicle.VehicleBlockCollisionEvent;
- import org.bukkit.event.vehicle.VehicleEnterEvent;
- import org.bukkit.event.vehicle.VehicleExitEvent;
-+import org.spigotmc.event.entity.EntityDismountEvent;
-+import org.spigotmc.event.entity.EntityMountEvent;
- import org.bukkit.craftbukkit.CraftWorld;
- import org.bukkit.craftbukkit.entity.CraftEntity;
- import org.bukkit.craftbukkit.entity.CraftPlayer;
-@@ -1591,7 +1593,12 @@ public abstract class Entity implements ICommandListener {
+@@ -1591,7 +1591,11 @@ public abstract class Entity implements ICommandListener {
                     }
                 }
                 // CraftBukkit end
 -                pluginManager.callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
-+                EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(this.getBukkitEntity(), this.vehicle.getBukkitEntity());
+                org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ); // Spigot
 +                pluginManager.callEvent(event); // Spigot
-+                
 +                if (event.isCancelled() || vehicle != originalVehicle) {
 +                    return;
-+                } // Spigot
+                }
                 this.setPositionRotation(this.vehicle.locX, this.vehicle.getBoundingBox().b + (double) this.vehicle.length, this.vehicle.locZ, this.yaw, this.pitch);
                 this.vehicle.passenger = null;
             }
-@@ -1599,44 +1606,45 @@ public abstract class Entity implements ICommandListener {
+@@ -1599,44 +1603,44 @@ public abstract class Entity implements ICommandListener {
             this.vehicle = null;
         } else {
             // CraftBukkit start
@ -39,24 +29,25 @@ index 81ca499..7165579 100644
 +            if (entity.world.isChunkLoaded((int) entity.locX >> 4, (int) entity.locZ >> 4, true)) {
                 // It's possible to move from one vehicle to another.  We need to check if they're already in a vehicle, and fire an exit event if they are.
                 VehicleExitEvent exitEvent = null;
-+                EntityDismountEvent exitEvent1 = null;
+                org.spigotmc.event.entity.EntityDismountEvent exitEvent1 = null;
                 if (this.vehicle != null) {
 -                    exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
-+                    if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle))
+-                    pluginManager.callEvent(exitEvent);
+                    if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle)) {
 +                        exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
-                     pluginManager.callEvent(exitEvent);
+                        pluginManager.callEvent(exitEvent);
+
+                        if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
+                            return;
+                        }
+                    }
+                    exitEvent1 = new org.spigotmc.event.entity.EntityDismountEvent(this.vehicle.getBukkitEntity(), this.bukkitEntity);
+                    pluginManager.callEvent(exitEvent1);
 
-                     if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
+-                    if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
+                    if (exitEvent1.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
                         return;
                     }
-+                    
-+                    exitEvent1 = new EntityDismountEvent(this.vehicle.getBukkitEntity(), this.bukkitEntity);
-+
-+                    pluginManager.callEvent(exitEvent1);
-+
-+                    if (exitEvent1.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
-+                        return;
-+                    }
                 }
 
 -                VehicleEnterEvent event = new VehicleEnterEvent((Vehicle) entity.getBukkitEntity(), this.bukkitEntity);
@ -101,36 +92,25 @@ index 81ca499..7165579 100644
             if (this.vehicle != null) {
                 this.vehicle.passenger = null;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b861dbe..96b3905 100644
+index f75b0b1..19fc521 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -21,6 +21,7 @@ import org.bukkit.event.entity.EntityDamageEvent;
- import org.bukkit.event.entity.EntityDamageEvent.DamageModifier;
- import org.bukkit.event.entity.EntityRegainHealthEvent;
- import org.bukkit.event.vehicle.VehicleExitEvent;
-+import org.spigotmc.event.entity.EntityDismountEvent;
- // CraftBukkit end
- 
- import org.bukkit.craftbukkit.SpigotTimings; // Spigot
-@@ -1725,8 +1726,15 @@ public abstract class EntityLiving extends Entity {
+@@ -1725,6 +1725,13 @@ public abstract class EntityLiving extends Entity {
                     return;
                 }
             }
 +
-+            EntityDismountEvent event = new EntityDismountEvent(this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
+            org.spigotmc.event.entity.EntityDismountEvent event = new org.spigotmc.event.entity.EntityDismountEvent(this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
 +            getBukkitEntity().getServer().getPluginManager().callEvent(event);
 +
 +            if (event.isCancelled() || vehicle != originalVehicle) {
 +                return;
 +            }
             // CraftBukkit end
-            
-+
-             if (!this.world.isClientSide) {
-                 this.q(this.vehicle);
-             }
+             org.bukkit.Bukkit.getPluginManager().callEvent( new org.spigotmc.event.entity.EntityDismountEvent( this.getBukkitEntity(), this.vehicle.getBukkitEntity() ) ); // Spigot
+             
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index efbf1a8..dbc7b54 100644
+index efbf1a8..ad53590 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -1,6 +1,7 @@
@ -141,19 +121,17 @@ index efbf1a8..dbc7b54 100644
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-@@ -234,6 +235,12 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+@@ -233,6 +234,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
+ 
         // If this entity is riding another entity, we must dismount before teleporting.
         entity.mount(null);
- 
-+        if (!Doubles.isFinite(location.getX()) || !Doubles.isFinite(location.getY()) || !Doubles.isFinite(location.getZ()))
-+        {
+        if (!Doubles.isFinite(location.getX()) || !Doubles.isFinite(location.getY()) || !Doubles.isFinite(location.getZ())) {
 +            Thread.dumpStack();
 +            return false;
 +        }
-+        
+ 
         // Spigot start
         if (!location.getWorld().equals(getWorld())) {
-           entity.teleportTo(location, cause.equals(TeleportCause.NETHER_PORTAL));
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0018-Server-freezing-fix-fake-yaw-pitch.patch
+++ b/Patches/CraftBukkit-Patches/0018-Server-freezing-fix-fake-yaw-pitch.patch
@ -1,11 +1,11 @@
-From 3b4526267e3bd53d9e70578ec1c7a8cd13038e73 Mon Sep 17 00:00:00 2001
+From 6514e2834135adf7d133d11bbcad9377544d73f0 Mon Sep 17 00:00:00 2001
 From: libraryaddict <libraryaddict115@yahoo.co.nz>
 Date: Fri, 27 Nov 2015 22:26:34 +1300
 Subject: [PATCH] Server freezing, fix fake yaw/pitch


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7165579..4f366da 100644
+index 2a4f819..721d0e6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -5,6 +5,7 @@ import java.util.List;
@ -16,7 +16,7 @@ index 7165579..4f366da 100644
 
 // CraftBukkit start
 import org.bukkit.Bukkit;
-@@ -153,6 +154,12 @@ public abstract class Entity implements ICommandListener {
+@@ -151,6 +152,12 @@ public abstract class Entity implements ICommandListener {
     public void setFakeHead(boolean fakeHead)
     {
         _fakeHead = fakeHead;
@ -29,7 +29,7 @@ index 7165579..4f366da 100644
     }
     
     public boolean isSilent()
-@@ -1024,9 +1031,18 @@ public abstract class Entity implements ICommandListener {
+@@ -1022,9 +1029,18 @@ public abstract class Entity implements ICommandListener {
         this.lastX = this.locX = d0;
         this.lastY = this.locY = d1;
         this.lastZ = this.locZ = d2;
@ -64,5 +64,5 @@ index 5edef3e..d3b1586 100644
         } else {
             WorldServer worldserver = this.minecraftServer.getWorldServer(this.player.dimension);
 -- 
-1.9.5.msysgit.0
+2.5.0

--- a/Patches/CraftBukkit-Patches/0019-Sound-and-vehicle-fixes.patch
+++ b/Patches/CraftBukkit-Patches/0019-Sound-and-vehicle-fixes.patch
@ -0,0 +1,26 @@
+From 22472882d2708e0eb4e35f0d31978b70d2c4b4f5 Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Tue, 12 Jan 2016 19:56:07 +1300
+Subject: [PATCH] Sound and vehicle fixes
+
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+index 0cc8f9b..dd07600 100644
+--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
+@@ -14,9 +14,9 @@ public class CraftSound {
+         set(AMBIENCE_RAIN, "ambient.weather.rain");
+         set(AMBIENCE_THUNDER, "ambient.weather.thunder");
+         // Damage
+-        set(HURT_FLESH, "game.neutral.hurt");
+-        set(FALL_BIG, "game.neutral.hurt.fall.big");
+-        set(FALL_SMALL, "game.neutral.hurt.fall.small");
+        set(HURT_FLESH, "game.player.hurt");
+        set(FALL_BIG, "game.player.hurt.fall.big");
+        set(FALL_SMALL, "game.player.hurt.fall.small");
+         // Dig Sounds
+         set(DIG_WOOL, "dig.cloth");
+         set(DIG_GRASS, "dig.grass");
+-- 
+2.5.0
+
--- a/Patches/CraftBukkit-Patches/0020-md_5-s-player-interaction-for-specs-patch.patch
+++ b/Patches/CraftBukkit-Patches/0020-md_5-s-player-interaction-for-specs-patch.patch
@ -0,0 +1,31 @@
+From 1e687cfb7b343f9c2a2e3cfdef346a896be747bb Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Fri, 29 Jan 2016 16:59:00 +1300
+Subject: [PATCH] md_5's player interaction for specs patch
+
+
+diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
+index d3b1586..6fd49b3 100644
+--- a/src/main/java/net/minecraft/server/PlayerConnection.java
+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
+@@ -1206,6 +1206,17 @@ public class PlayerConnection implements PacketListenerPlayIn, IUpdatePlayerList
+         if (movingobjectposition == null || movingobjectposition.type != MovingObjectPosition.EnumMovingObjectType.BLOCK) {
+             CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_AIR, this.player.inventory.getItemInHand());
+         }
+        // Spigot start
+        else if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK
+                && (player.playerInteractManager.getGameMode() == WorldSettings.EnumGamemode.ADVENTURE || player.playerInteractManager.getGameMode() == WorldSettings.EnumGamemode.SPECTATOR)) {
+            // RIGHT_CLICK_BLOCK sets this flag
+            if (player.playerInteractManager.firedInteract) {
+                player.playerInteractManager.firedInteract = false;
+            } else {
+                CraftEventFactory.callPlayerInteractEvent(this.player, Action.LEFT_CLICK_BLOCK, movingobjectposition.a(), movingobjectposition.direction, player.inventory.getItemInHand(), true);
+            }
+        }
+        // Spigot end
+ 
+         // Arm swing animation
+         PlayerAnimationEvent event = new PlayerAnimationEvent(this.getPlayer());
+-- 
+2.5.0
+
--- a/Patches/CraftBukkit-Patches/0021-Fix-enderman-teleporting-when-vegetated.patch
+++ b/Patches/CraftBukkit-Patches/0021-Fix-enderman-teleporting-when-vegetated.patch
@ -0,0 +1,25 @@
+From 125596ec9aee25d141781b4010eac881c7b36eb5 Mon Sep 17 00:00:00 2001
+From: libraryaddict <libraryaddict115@yahoo.co.nz>
+Date: Fri, 29 Jan 2016 16:59:12 +1300
+Subject: [PATCH] Fix enderman teleporting when vegetated
+
+
+diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
+index a250062..5ad2d07 100644
+--- a/src/main/java/net/minecraft/server/EntityEnderman.java
+++ b/src/main/java/net/minecraft/server/EntityEnderman.java
+@@ -157,6 +157,11 @@ public class EntityEnderman extends EntityMonster {
+     }
+ 
+     protected boolean k(double d0, double d1, double d2) {
+        if (isVegetated())
+        {
+            return false;
+        }
+
+         double d3 = this.locX;
+         double d4 = this.locY;
+         double d5 = this.locZ;
+-- 
+2.5.0
+
--- a/Patches/CraftBukkit-Patches/0022-Implement-Sentry-for-exception-monitoring.patch
+++ b/Patches/CraftBukkit-Patches/0022-Implement-Sentry-for-exception-monitoring.patch
@ -0,0 +1,327 @@
+From 742d6b5d828128519f06f7c6f5e188847263e609 Mon Sep 17 00:00:00 2001
+From: md_5 <git@md-5.net>
+Date: Sun, 7 Feb 2016 20:28:54 +1100
+Subject: [PATCH] Implement Sentry for exception monitoring.
+
+
+diff --git a/pom.xml b/pom.xml
+index c1d1fb7..ceb3ec2 100644
+--- a/pom.xml
+++ b/pom.xml
+@@ -29,6 +29,12 @@
+ 
+     <dependencies>
+         <dependency>
+            <groupId>net.kencochrane.raven</groupId>
+            <artifactId>raven-log4j2</artifactId>
+            <version>6.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+             <groupId>net.sf.trove4j</groupId>
+             <artifactId>trove4j</artifactId>
+             <version>3.0.3</version>
+@@ -202,6 +208,20 @@
+                             <goal>shade</goal>
+                         </goals>
+                         <configuration>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/org/apache/logging/log4j/core/config/plugins/</exclude>
+                                    </excludes>
+                                </filter>
+                                <filter>
+                                    <artifact>*:minecraft-server</artifact>
+                                    <excludes>
+                                        <exclude>org/apache/logging/log4j/</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                             <relocations>
+                                 <relocation>
+                                     <pattern>joptsimple</pattern>
+diff --git a/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java b/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+deleted file mode 100644
+index 341eaa3..0000000
+--- a/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++ /dev/null
+@@ -1,245 +0,0 @@
+-/*
+- * Licensed to the Apache Software Foundation (ASF) under one or more
+- * contributor license agreements. See the NOTICE file distributed with
+- * this work for additional information regarding copyright ownership.
+- * The ASF licenses this file to You under the Apache license, Version 2.0
+- * (the "License"); you may not use this file except in compliance with
+- * the License. You may obtain a copy of the License at
+- *
+- *      http://www.apache.org/licenses/LICENSE-2.0
+- *
+- * Unless required by applicable law or agreed to in writing, software
+- * distributed under the License is distributed on an "AS IS" BASIS,
+- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+- * See the license for the specific language governing permissions and
+- * limitations under the license.
+- */
+-package org.apache.logging.log4j.core.appender;
+-
+-import java.io.IOException;
+-import java.io.OutputStream;
+-import java.io.PrintStream;
+-import java.io.Serializable;
+-import java.io.UnsupportedEncodingException;
+-import java.lang.reflect.Constructor;
+-import java.nio.charset.Charset;
+-
+-import org.apache.logging.log4j.core.Filter;
+-import org.apache.logging.log4j.core.Layout;
+-import org.apache.logging.log4j.core.config.plugins.Plugin;
+-import org.apache.logging.log4j.core.config.plugins.PluginAttribute;
+-import org.apache.logging.log4j.core.config.plugins.PluginElement;
+-import org.apache.logging.log4j.core.config.plugins.PluginFactory;
+-import org.apache.logging.log4j.core.helpers.Booleans;
+-import org.apache.logging.log4j.core.helpers.Loader;
+-import org.apache.logging.log4j.core.layout.PatternLayout;
+-import org.apache.logging.log4j.util.PropertiesUtil;
+-
+-/**
+- * ConsoleAppender appends log events to <code>System.out</code> or
+- * <code>System.err</code> using a layout specified by the user. The
+- * default target is <code>System.out</code>.
+- * @doubt accessing System.out or .err as a byte stream instead of a writer
+- *    bypasses the JVM's knowledge of the proper encoding. (RG) Encoding
+- * is handled within the Layout. Typically, a Layout will generate a String
+- * and then call getBytes which may use a configured encoding or the system
+- * default. OTOH, a Writer cannot print byte streams.
+- */
+-@Plugin(name = "Console", category = "Core", elementType = "appender", printObject = true)
+-public final class ConsoleAppender extends AbstractOutputStreamAppender {
+-
+-    private static final String JANSI_CLASS = "org.fusesource.jansi.WindowsAnsiOutputStream";
+-    private static ConsoleManagerFactory factory = new ConsoleManagerFactory();
+-
+-    /**
+-     * Enumeration of console destinations.
+-     */
+-    public enum Target {
+-        /** Standard output. */
+-        SYSTEM_OUT,
+-        /** Standard error output. */
+-        SYSTEM_ERR
+-    }
+-
+-    private ConsoleAppender(final String name, final Layout<? extends Serializable> layout, final Filter filter,
+-                            final OutputStreamManager manager,
+-                            final boolean ignoreExceptions) {
+-        super(name, layout, filter, ignoreExceptions, true, manager);
+-    }
+-
+-    /**
+-     * Create a Console Appender.
+-     * @param layout The layout to use (required).
+-     * @param filter The Filter or null.
+-     * @param t The target ("SYSTEM_OUT" or "SYSTEM_ERR"). The default is "SYSTEM_OUT".
+-     * @param follow If true will follow changes to the underlying output stream.
+-     * @param name The name of the Appender (required).
+-     * @param ignore If {@code "true"} (default) exceptions encountered when appending events are logged; otherwise
+-     *               they are propagated to the caller.
+-     * @return The ConsoleAppender.
+-     */
+-    @PluginFactory
+-    public static ConsoleAppender createAppender(
+-            @PluginElement("Layout") Layout<? extends Serializable> layout,
+-            @PluginElement("Filters") final Filter filter,
+-            @PluginAttribute("target") final String t,
+-            @PluginAttribute("name") final String name,
+-            @PluginAttribute("follow") final String follow,
+-            @PluginAttribute("ignoreExceptions") final String ignore) {
+-        if (name == null) {
+-            LOGGER.error("No name provided for ConsoleAppender");
+-            return null;
+-        }
+-        if (layout == null) {
+-            layout = PatternLayout.createLayout(null, null, null, null, null);
+-        }
+-        final boolean isFollow = Boolean.parseBoolean(follow);
+-        final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
+-        final Target target = t == null ? Target.SYSTEM_OUT : Target.valueOf(t);
+-        return new ConsoleAppender(name, layout, filter, getManager(isFollow, target, layout), ignoreExceptions);
+-    }
+-
+-    private static OutputStreamManager getManager(final boolean follow, final Target target, final Layout<? extends Serializable> layout) {
+-        final String type = target.name();
+-        final OutputStream os = getOutputStream(follow, target);
+-        return OutputStreamManager.getManager(target.name() + "." + follow, new FactoryData(os, type, layout), factory);
+-    }
+-
+-    private static OutputStream getOutputStream(final boolean follow, final Target target) {
+-        final String enc = Charset.defaultCharset().name();
+-        PrintStream printStream = null;
+-        try {
+-            printStream = target == Target.SYSTEM_OUT ?
+-                    follow ? new PrintStream(new SystemOutStream(), true, enc) : System.out :
+-                    follow ? new PrintStream(new SystemErrStream(), true, enc) : System.err;
+-        } catch (final UnsupportedEncodingException ex) { // should never happen
+-            throw new IllegalStateException("Unsupported default encoding " + enc, ex);
+-        }
+-        final PropertiesUtil propsUtil = PropertiesUtil.getProperties();
+-        if (!propsUtil.getStringProperty("os.name").startsWith("Windows") ||
+-                propsUtil.getBooleanProperty("log4j.skipJansi")) {
+-            return printStream;
+-        }
+-        try {
+-            final ClassLoader loader = Loader.getClassLoader();
+-            // We type the parameter as a wildcard to avoid a hard reference to Jansi.
+-            final Class<?> clazz = loader.loadClass(JANSI_CLASS);
+-            final Constructor<?> constructor = clazz.getConstructor(OutputStream.class);
+-            return (OutputStream) constructor.newInstance(printStream);
+-        } catch (final ClassNotFoundException cnfe) {
+-            LOGGER.debug("Jansi is not installed, cannot find {}", JANSI_CLASS);
+-        } catch (final NoSuchMethodException nsme) {
+-            LOGGER.warn("{} is missing the proper constructor", JANSI_CLASS);
+-        } catch (final Throwable ex) { // CraftBukkit - Exception -> Throwable
+-            LOGGER.warn("Unable to instantiate {}", JANSI_CLASS);
+-        }
+-        return printStream;
+-    }
+-
+-    /**
+-     * An implementation of OutputStream that redirects to the current System.err.
+-     */
+-    private static class SystemErrStream extends OutputStream {
+-        public SystemErrStream() {
+-        }
+-
+-        @Override
+-        public void close() {
+-            // do not close sys err!
+-        }
+-
+-        @Override
+-        public void flush() {
+-            System.err.flush();
+-        }
+-
+-        @Override
+-        public void write(final byte[] b) throws IOException {
+-            System.err.write(b);
+-        }
+-
+-        @Override
+-        public void write(final byte[] b, final int off, final int len)
+-                throws IOException {
+-            System.err.write(b, off, len);
+-        }
+-
+-        @Override
+-        public void write(final int b) {
+-            System.err.write(b);
+-        }
+-    }
+-
+-    /**
+-     * An implementation of OutputStream that redirects to the current System.out.
+-     */
+-    private static class SystemOutStream extends OutputStream {
+-        public SystemOutStream() {
+-        }
+-
+-        @Override
+-        public void close() {
+-            // do not close sys out!
+-        }
+-
+-        @Override
+-        public void flush() {
+-            System.out.flush();
+-        }
+-
+-        @Override
+-        public void write(final byte[] b) throws IOException {
+-            System.out.write(b);
+-        }
+-
+-        @Override
+-        public void write(final byte[] b, final int off, final int len)
+-                throws IOException {
+-            System.out.write(b, off, len);
+-        }
+-
+-        @Override
+-        public void write(final int b) throws IOException {
+-            System.out.write(b);
+-        }
+-    }
+-
+-    /**
+-     * Data to pass to factory method.
+-     */
+-    private static class FactoryData {
+-        private final OutputStream os;
+-        private final String type;
+-        private final Layout<? extends Serializable> layout;
+-
+-        /**
+-         * Constructor.
+-         * @param os The OutputStream.
+-         * @param type The name of the target.
+-         * @param layout A Serializable layout
+-         */
+-        public FactoryData(final OutputStream os, final String type, final Layout<? extends Serializable> layout) {
+-            this.os = os;
+-            this.type = type;
+-            this.layout = layout;
+-        }
+-    }
+-
+-    /**
+-     * Factory to create the Appender.
+-     */
+-    private static class ConsoleManagerFactory implements ManagerFactory<OutputStreamManager, FactoryData> {
+-
+-        /**
+-         * Create an OutputStreamManager.
+-         * @param name The name of the entity to manage.
+-         * @param data The data required to create the entity.
+-         * @return The OutputStreamManager
+-         */
+-        @Override
+-        public OutputStreamManager createManager(final String name, final FactoryData data) {
+-            return new OutputStreamManager(data.os, data.type, data.layout);
+-        }
+-    }
+-
+-}
+diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
+index f37d1c2..b9d8704 100644
+--- a/src/main/resources/log4j2.xml
+++ b/src/main/resources/log4j2.xml
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<Configuration status="WARN" packages="com.mojang.util">
+<Configuration status="WARN" packages="com.mojang.util,net.kencochrane.raven.log4j2">
+     <Appenders>
+         <Console name="WINDOWS_COMPAT" target="SYSTEM_OUT"></Console>
+         <Queue name="TerminalConsole">
+@@ -12,6 +12,9 @@
+                 <OnStartupTriggeringPolicy />
+             </Policies>
+         </RollingRandomAccessFile>
+        <Raven name="Sentry">
+            <dsn>https://9dbb188a495a4145998c3478534c7052:89fefe0909f34090a6a7ad9397a31bd7@app.getsentry.com/66319</dsn>
+        </Raven>
+     </Appenders>
+     <Loggers>
+         <Root level="info">
+@@ -21,6 +24,7 @@
+             <AppenderRef ref="WINDOWS_COMPAT" level="info"/>
+             <AppenderRef ref="File"/>
+             <AppenderRef ref="TerminalConsole" level="info"/>
+            <AppenderRef ref="Sentry" level="error"/>
+         </Root>
+     </Loggers>
+ </Configuration>
+-- 
+2.5.0
+
--- a/Patches/CraftBukkit-Patches/0165-Inventory-changes.patch
+++ b/Patches/CraftBukkit-Patches/0165-Inventory-changes.patch
@ -1,428 +0,0 @@
-From 702360d29859ed580b44255ccb7f2f124e6aa24b Mon Sep 17 00:00:00 2001
-From: libraryaddict <libraryaddict115@yahoo.co.nz>
-Date: Fri, 23 Oct 2015 21:22:36 +1300
-Subject: [PATCH] Inventory changes
-
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-index e9a3c50..9fd6359 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventory.java
-@@ -441,8 +441,8 @@ public class CraftInventory implements Inventory {
-            return InventoryType.ENCHANTING;
-         } else if (inventory instanceof TileEntityBrewingStand) {
-             return InventoryType.BREWING;
-        } else if (inventory instanceof CraftInventoryCustom.MinecraftInventory) {
-            return ((CraftInventoryCustom.MinecraftInventory) inventory).getType();
-+        } else if (inventory instanceof MinecraftInventory) {
-+            return ((MinecraftInventory) inventory).getType();
-         } else if (inventory instanceof InventoryEnderChest) {
-             return InventoryType.ENDER_CHEST;
-         } else if (inventory instanceof InventoryMerchant) {
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
-index 947c493..eed9afa 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryCustom.java
-@@ -31,168 +31,4 @@ public class CraftInventoryCustom extends CraftInventory {
-     public CraftInventoryCustom(InventoryHolder owner, int size, String title) {
-         super(new MinecraftInventory(owner, size, title));
-     }
-
-    static class MinecraftInventory implements IInventory {
-        private final ItemStack[] items;
-        private int maxStack = MAX_STACK;
-        private final List<HumanEntity> viewers;
-        private final String title;
-        private InventoryType type;
-        private final InventoryHolder owner;
-
-        public MinecraftInventory(InventoryHolder owner, InventoryType type) {
-            this(owner, type.getDefaultSize(), type.getDefaultTitle());
-            this.type = type;
-        }
-
-        public MinecraftInventory(InventoryHolder owner, InventoryType type, String title) {
-            this(owner, type.getDefaultSize(), title);
-            this.type = type;
-        }
-
-        public MinecraftInventory(InventoryHolder owner, int size) {
-            this(owner, size, "Chest");
-        }
-
-        public MinecraftInventory(InventoryHolder owner, int size, String title) {
-            Validate.notNull(title, "Title cannot be null");
-            Validate.isTrue(title.length() <= 32, "Title cannot be longer than 32 characters");
-            this.items = new ItemStack[size];
-            this.title = title;
-            this.viewers = new ArrayList<HumanEntity>();
-            this.owner = owner;
-            this.type = InventoryType.CHEST;
-        }
-
-        public int getSize() {
-            return items.length;
-        }
-
-        public ItemStack getItem(int i) {
-            return items[i];
-        }
-
-        public ItemStack splitStack(int i, int j) {
-            ItemStack stack = this.getItem(i);
-            ItemStack result;
-            if (stack == null) return null;
-            if (stack.count <= j) {
-                this.setItem(i, null);
-                result = stack;
-            } else {
-                result = CraftItemStack.copyNMSStack(stack, j);
-                stack.count -= j;
-            }
-            this.update();
-            return result;
-        }
-
-        public ItemStack splitWithoutUpdate(int i) {
-            ItemStack stack = this.getItem(i);
-            ItemStack result;
-            if (stack == null) return null;
-            if (stack.count <= 1) {
-                this.setItem(i, null);
-                result = stack;
-            } else {
-                result = CraftItemStack.copyNMSStack(stack, 1);
-                stack.count -= 1;
-            }
-            return result;
-        }
-
-        public void setItem(int i, ItemStack itemstack) {
-            items[i] = itemstack;
-            if (itemstack != null && this.getMaxStackSize() > 0 && itemstack.count > this.getMaxStackSize()) {
-                itemstack.count = this.getMaxStackSize();
-            }
-        }
-
-        public int getMaxStackSize() {
-            return maxStack;
-        }
-
-        public void setMaxStackSize(int size) {
-            maxStack = size;
-        }
-
-        public void update() {}
-
-        public boolean a(EntityHuman entityhuman) {
-            return true;
-        }
-
-        public ItemStack[] getContents() {
-            return items;
-        }
-
-        public void onOpen(CraftHumanEntity who) {
-            viewers.add(who);
-        }
-
-        public void onClose(CraftHumanEntity who) {
-            viewers.remove(who);
-        }
-
-        public List<HumanEntity> getViewers() {
-            return viewers;
-        }
-
-        public InventoryType getType() {
-            return type;
-        }
-        
-        public InventoryHolder getOwner() {
-            return owner;
-        }
-
-        public boolean b(int i, ItemStack itemstack) {
-            return true;
-        }
-
-        @Override
-        public void startOpen(EntityHuman entityHuman) {
-
-        }
-
-        @Override
-        public void closeContainer(EntityHuman entityHuman) {
-
-        }
-
-        @Override
-        public int getProperty(int i) {
-            return 0;
-        }
-
-        @Override
-        public void b(int i, int i1) {
-
-        }
-
-        @Override
-        public int g() {
-            return 0;
-        }
-
-        @Override
-        public void l() {
-
-        }
-
-        @Override
-        public String getName() {
-            return title;
-        }
-
-        @Override
-        public boolean hasCustomName() {
-            return title != null;
-        }
-
-        @Override
-        public IChatBaseComponent getScoreboardDisplayName() {
-            return new ChatComponentText(title);
-        }
-    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 23f05f4..fdaf026 100644
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-@@ -26,7 +26,7 @@ import net.minecraft.server.NBTTagString;
- import org.bukkit.craftbukkit.util.CraftChatMessage;
- 
- @DelegateDeserialization(ItemStack.class)
-public final class CraftItemStack extends ItemStack {
-+public class CraftItemStack extends ItemStack {
- 
-     public static net.minecraft.server.ItemStack asNMSCopy(ItemStack original) {
-         if (original instanceof CraftItemStack) {
-@@ -95,26 +95,30 @@ public final class CraftItemStack extends ItemStack {
-     /**
-      * Mirror
-      */
-    private CraftItemStack(net.minecraft.server.ItemStack item) {
-+    protected CraftItemStack(net.minecraft.server.ItemStack item) {
-         this.handle = item;
-     }
- 
-    private CraftItemStack(ItemStack item) {
-+    protected CraftItemStack(ItemStack item) {
-         this(item.getTypeId(), item.getAmount(), item.getDurability(), item.hasItemMeta() ? item.getItemMeta() : null);
-     }
- 
-    private CraftItemStack(Material type, int amount, short durability, ItemMeta itemMeta) {
-+    protected CraftItemStack(Material type, int amount, short durability, ItemMeta itemMeta) {
-         setType(type);
-         setAmount(amount);
-         setDurability(durability);
-         setItemMeta(itemMeta);
-     }
- 
-    private CraftItemStack(int typeId, int amount, short durability, ItemMeta itemMeta) {
-+    protected CraftItemStack(int typeId, int amount, short durability, ItemMeta itemMeta) {
-         this(Material.getMaterial(typeId), amount, durability, itemMeta);
- 
-     }
- 
-+    public net.minecraft.server.ItemStack getHandle() {
-+        return handle;
-+    }
-+
-     @Override
-     public int getTypeId() {
-         return handle != null ? CraftMagicNumbers.getId(handle.getItem()) : 0;
-diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/MinecraftInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/MinecraftInventory.java
-new file mode 100644
-index 0000000..f0d8f81
--- /dev/null
-+++ b/src/main/java/org/bukkit/craftbukkit/inventory/MinecraftInventory.java
-@@ -0,0 +1,177 @@
-+package org.bukkit.craftbukkit.inventory;
-+
-+import net.minecraft.server.*;
-+import org.apache.commons.lang.Validate;
-+import org.bukkit.craftbukkit.entity.CraftHumanEntity;
-+import org.bukkit.craftbukkit.inventory.CraftItemStack;
-+import org.bukkit.entity.HumanEntity;
-+import org.bukkit.event.inventory.InventoryType;
-+import org.bukkit.inventory.InventoryHolder;
-+
-+import java.util.ArrayList;
-+import java.util.List;
-+
-+public class MinecraftInventory implements IInventory
-+{
-+    private final ItemStack[] items;
-+    private int maxStack = MAX_STACK;
-+    private final List<HumanEntity> viewers;
-+    private final String title;
-+    private InventoryType type;
-+    private final InventoryHolder owner;
-+
-+    public MinecraftInventory(InventoryHolder owner, InventoryType type) {
-+        this(owner, type.getDefaultSize(), type.getDefaultTitle());
-+        this.type = type;
-+    }
-+
-+    public MinecraftInventory(InventoryHolder owner, InventoryType type, String title) {
-+        this(owner, type.getDefaultSize(), title);
-+        this.type = type;
-+    }
-+
-+    public MinecraftInventory(InventoryHolder owner, int size) {
-+        this(owner, size, "Chest");
-+    }
-+
-+    public MinecraftInventory(InventoryHolder owner, int size, String title) {
-+        Validate.notNull(title, "Title cannot be null");
-+        Validate.isTrue(title.length() <= 32, "Title cannot be longer than 32 characters");
-+        this.items = new ItemStack[size];
-+        this.title = title;
-+        this.viewers = new ArrayList<HumanEntity>();
-+        this.owner = owner;
-+        this.type = InventoryType.CHEST;
-+    }
-+
-+    public int getSize() {
-+        return items.length;
-+    }
-+
-+    public ItemStack getItem(int i) {
-+        return items[i];
-+    }
-+
-+    public ItemStack splitStack(int i, int j) {
-+        ItemStack stack = this.getItem(i);
-+        ItemStack result;
-+        if (stack == null) return null;
-+        if (stack.count <= j) {
-+            this.setItem(i, null);
-+            result = stack;
-+        } else {
-+            result = CraftItemStack.copyNMSStack(stack, j);
-+            stack.count -= j;
-+        }
-+        this.update();
-+        return result;
-+    }
-+
-+    public ItemStack splitWithoutUpdate(int i) {
-+        ItemStack stack = this.getItem(i);
-+        ItemStack result;
-+        if (stack == null) return null;
-+        if (stack.count <= 1) {
-+            this.setItem(i, null);
-+            result = stack;
-+        } else {
-+            result = CraftItemStack.copyNMSStack(stack, 1);
-+            stack.count -= 1;
-+        }
-+        return result;
-+    }
-+
-+    public void setItem(int i, ItemStack itemstack) {
-+        items[i] = itemstack;
-+        if (itemstack != null && this.getMaxStackSize() > 0 && itemstack.count > this.getMaxStackSize()) {
-+            itemstack.count = this.getMaxStackSize();
-+        }
-+    }
-+
-+    public int getMaxStackSize() {
-+        return maxStack;
-+    }
-+
-+    public void setMaxStackSize(int size) {
-+        maxStack = size;
-+    }
-+
-+    public void update() {}
-+
-+    public boolean a(EntityHuman entityhuman) {
-+        return true;
-+    }
-+
-+    public ItemStack[] getContents() {
-+        return items;
-+    }
-+
-+    public void onOpen(CraftHumanEntity who) {
-+        viewers.add(who);
-+    }
-+
-+    public void onClose(CraftHumanEntity who) {
-+        viewers.remove(who);
-+    }
-+
-+    public List<HumanEntity> getViewers() {
-+        return viewers;
-+    }
-+
-+    public InventoryType getType() {
-+        return type;
-+    }
-+
-+    public InventoryHolder getOwner() {
-+        return owner;
-+    }
-+
-+    public boolean b(int i, ItemStack itemstack) {
-+        return true;
-+    }
-+
-+    @Override
-+    public void startOpen(EntityHuman entityHuman) {
-+
-+    }
-+
-+    @Override
-+    public void closeContainer(EntityHuman entityHuman) {
-+
-+    }
-+
-+    @Override
-+    public int getProperty(int i) {
-+        return 0;
-+    }
-+
-+    @Override
-+    public void b(int i, int i1) {
-+
-+    }
-+
-+    @Override
-+    public int g() {
-+        return 0;
-+    }
-+
-+    @Override
-+    public void l() {
-+
-+    }
-+
-+    @Override
-+    public String getName() {
-+        return title;
-+    }
-+
-+    @Override
-+    public boolean hasCustomName() {
-+        return title != null;
-+    }
-+
-+    @Override
-+    public IChatBaseComponent getScoreboardDisplayName() {
-+        return new ChatComponentText(title);
-+    }
-+}
-- 
-1.9.5.msysgit.0
-
--- a/Patches/CraftBukkit-Patches/0178-Sound-and-vehicle-fixes.patch
+++ b/Patches/CraftBukkit-Patches/0178-Sound-and-vehicle-fixes.patch
@ -1,47 +0,0 @@
-From 2522a926e6cc670f4f10657ea5494b5ffe81eb37 Mon Sep 17 00:00:00 2001
-From: libraryaddict <libraryaddict115@yahoo.co.nz>
-Date: Tue, 12 Jan 2016 19:56:07 +1300
-Subject: [PATCH] Sound and vehicle fixes
-
-
-diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4f366da..fc9cce0 100644
--- a/src/main/java/net/minecraft/server/Entity.java
-+++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1628,11 +1628,13 @@ public abstract class Entity implements ICommandListener {
-                 EntityDismountEvent exitEvent1 = null;
-                 if (this.vehicle != null) {
-                     if ((this.bukkitEntity instanceof LivingEntity) && (entity.getBukkitEntity() instanceof Vehicle))
-+                    {
-                         exitEvent = new VehicleExitEvent((Vehicle) this.vehicle.getBukkitEntity(), (LivingEntity) this.bukkitEntity);
-                    pluginManager.callEvent(exitEvent);
-+                        pluginManager.callEvent(exitEvent);
- 
-                    if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
-                        return;
-+                        if (exitEvent.isCancelled() || this.vehicle != originalVehicle || (this.vehicle != null && this.vehicle.passenger != originalPassenger)) {
-+                            return;
-+                        }
-                     }
-                     
-                     exitEvent1 = new EntityDismountEvent(this.vehicle.getBukkitEntity(), this.bukkitEntity);
-diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 0cc8f9b..dd07600 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-+++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-@@ -14,9 +14,9 @@ public class CraftSound {
-         set(AMBIENCE_RAIN, "ambient.weather.rain");
-         set(AMBIENCE_THUNDER, "ambient.weather.thunder");
-         // Damage
-        set(HURT_FLESH, "game.neutral.hurt");
-        set(FALL_BIG, "game.neutral.hurt.fall.big");
-        set(FALL_SMALL, "game.neutral.hurt.fall.small");
-+        set(HURT_FLESH, "game.player.hurt");
-+        set(FALL_BIG, "game.player.hurt.fall.big");
-+        set(FALL_SMALL, "game.player.hurt.fall.small");
-         // Dig Sounds
-         set(DIG_WOOL, "dig.cloth");
-         set(DIG_GRASS, "dig.grass");
-- 
-1.9.5.msysgit.0
-
--- a/Plugins/Libraries/craftbukkit.jar
+++ b/Plugins/Libraries/craftbukkit.jar
--- a/Plugins/.idea/.name
+++ b/Plugins/.idea/.name
@ -1 +0,0 @@
-Mineplex
--- a/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_jar.xml
@ -1,11 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="Mineplex.Bungee.Mineplexer:jar">
-    <output-path>$PROJECT_DIR$/bin</output-path>
-    <root id="archive" name="Mineplexer.jar">
-      <element id="module-output" name="Mineplex.Bungee.Mineplexer" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-codec-1.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-io-2.4.jar" path-in-jar="/" />
-      <element id="file-copy" path="$PROJECT_DIR$/Mineplex.Bungee.Mineplexer/plugin.yml" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_test.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Bungee_Mineplexer_test.xml
@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="Mineplex.Bungee.Mineplexer:test">
-    <output-path>$PROJECT_DIR$/../Testing/Bungee/plugins</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="Mineplex.Bungee.Mineplexer:jar" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Game_Clans_jar.xml
@ -1,26 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="Mineplex.Game.Clans:jar">
-    <output-path>$PROJECT_DIR$/bin</output-path>
-    <root id="archive" name="Clans.jar">
-      <element id="module-output" name="Mineplex.Core" />
-      <element id="module-output" name="Mineplex.Core.Common" />
-      <element id="module-output" name="Mineplex.Database" />
-      <element id="module-output" name="Mineplex.Game.Clans" />
-      <element id="module-output" name="Mineplex.Minecraft.Game.Core" />
-      <element id="module-output" name="Mineplex.Minecraft.Game.ClassCombat" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-pool2-2.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-codec-1.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-logging-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jedis-2.4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpclient-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpcore-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
-      <element id="file-copy" path="$PROJECT_DIR$/Mineplex.Game.Clans/plugin.yml" />
-      <element id="module-output" name="Mineplex.ServerData" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
-      <element id="module-output" name="Mineplex.Game.Clans.Core" />
-      <element id="module-output" name="Mineplex.Cache" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_Game_Clans_test.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Game_Clans_test.xml
@ -1,9 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="Mineplex.Game.Clans:test">
-    <output-path>$PROJECT_DIR$/../Testing/Clans/plugins</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="Mineplex.Game.Clans:jar" />
-      <element id="library" level="project" name="NoCheatPlus" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Hub_jar.xml
@ -1,27 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="Mineplex.Hub:jar">
-    <output-path>$PROJECT_DIR$/bin</output-path>
-    <root id="archive" name="Hub.jar">
-      <element id="module-output" name="Mineplex.Hub" />
-      <element id="module-output" name="Mineplex.Core" />
-      <element id="module-output" name="Mineplex.Core.Common" />
-      <element id="module-output" name="Mineplex.Minecraft.Game.ClassCombat" />
-      <element id="module-output" name="Mineplex.Minecraft.Game.Core" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpcore-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-io-2.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpclient-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-codec-1.6.jar" path-in-jar="/" />
-      <element id="file-copy" path="$PROJECT_DIR$/Mineplex.Hub/plugin.yml" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-logging-1.1.1.jar" path-in-jar="/" />
-      <element id="module-output" name="Mineplex.ServerData" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-pool2-2.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jedis-2.4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
-      <element id="module-output" name="Mineplex.Database" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
-      <element id="module-output" name="Mineplex.Game.Clans.Core" />
-      <element id="module-output" name="Mineplex.Cache" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_Hub_test.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Hub_test.xml
@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact build-on-make="true" name="Mineplex.Hub:test">
-    <output-path>$PROJECT_DIR$/../Testing/Hub/plugins</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="Mineplex.Hub:jar" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_MapParser_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_MapParser_jar.xml
@ -1,10 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="Mineplex.MapParser:jar">
-    <output-path>$PROJECT_DIR$/bin</output-path>
-    <root id="archive" name="MapParser.jar">
-      <element id="module-output" name="Mineplex.MapParser" />
-      <element id="file-copy" path="$PROJECT_DIR$/Mineplex.MapParser/plugin.yml" />
-      <element id="module-output" name="Mineplex.Core.Common" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_MapParser_test.xml
+++ b/Plugins/.idea/artifacts/Mineplex_MapParser_test.xml
@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="Mineplex.MapParser:test">
-    <output-path>$PROJECT_DIR$/../Testing/MapParser/plugins</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="Mineplex.MapParser:jar" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_ServerMonitor_jar.xml
@ -1,12 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="Mineplex.ServerMonitor:jar">
-    <output-path>$PROJECT_DIR$/bin</output-path>
-    <root id="archive" name="ServerMonitor.jar">
-      <element id="module-output" name="Mineplex.ServerMonitor" />
-      <element id="module-output" name="Mineplex.Core.Common" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpcore-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpclient-4.2.jar" path-in-jar="/" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Mineplex_Votifier_jar.xml
+++ b/Plugins/.idea/artifacts/Mineplex_Votifier_jar.xml
@ -1,24 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" build-on-make="true" name="Mineplex.Votifier:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/</output-path>
-    <root id="archive" name="MineplexVotifier.jar">
-      <element id="module-output" name="Mineplex.Votifier" />
-      <element id="module-output" name="Mineplex.Core" />
-      <element id="module-output" name="Mineplex.Core.Common" />
-      <element id="module-output" name="Mineplex.ServerData" />
-      <element id="module-output" name="Mineplex.ServerMonitor" />
-      <element id="module-output" name="Mineplex.Database" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-io-2.4.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-logging-1.1.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-pool2-2.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-codec-1.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpclient-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpcore-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jedis-2.4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
-      <element id="file-copy" path="$PROJECT_DIR$/Mineplex.Votifier/plugin.yml" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
+++ b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_jar.xml
@ -1,25 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="Nautilus.Game.Arcade:jar">
-    <output-path>$PROJECT_DIR$/bin</output-path>
-    <root id="archive" name="Arcade.jar">
-      <element id="module-output" name="Nautilus.Game.Arcade" />
-      <element id="module-output" name="Mineplex.Core" />
-      <element id="module-output" name="Mineplex.Core.Common" />
-      <element id="module-output" name="Mineplex.Minecraft.Game.ClassCombat" />
-      <element id="module-output" name="Mineplex.Minecraft.Game.Core" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-codec-1.6.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpcore-4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/httpclient-4.2.jar" path-in-jar="/" />
-      <element id="file-copy" path="$PROJECT_DIR$/Nautilus.Game.Arcade/plugin.yml" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-logging-1.1.1.jar" path-in-jar="/" />
-      <element id="module-output" name="Mineplex.ServerData" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-pool2-2.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jedis-2.4.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/gson-2.2.1.jar" path-in-jar="/" />
-      <element id="module-output" name="Mineplex.Database" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/jooq-3.5.2.jar" path-in-jar="/" />
-      <element id="extracted-dir" path="$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar" path-in-jar="/" />
-      <element id="module-output" name="Mineplex.Cache" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml
+++ b/Plugins/.idea/artifacts/Nautilus_Game_Arcade_test.xml
@ -1,8 +0,0 @@
-<component name="ArtifactManager">
-  <artifact name="Nautilus.Game.Arcade:test">
-    <output-path>$PROJECT_DIR$/../Testing/Arcade/plugins</output-path>
-    <root id="root">
-      <element id="artifact" artifact-name="Nautilus.Game.Arcade:jar" />
-    </root>
-  </artifact>
-</component>
--- a/Plugins/.idea/codeStyleSettings.xml
+++ b/Plugins/.idea/codeStyleSettings.xml
@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectCodeStyleSettingsManager">
-    <option name="PER_PROJECT_SETTINGS">
-      <value>
-        <option name="FIELD_NAME_PREFIX" value="_" />
-        <option name="STATIC_FIELD_NAME_PREFIX" value="_" />
-        <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="20" />
-        <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
-        <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-          <value>
-            <package name="java.awt" withSubpackages="false" static="false" />
-            <package name="org.jooq.impl.DSL" withSubpackages="false" static="true" />
-            <package name="mineplex.database.Tables" withSubpackages="false" static="true" />
-            <package name="javax.swing" withSubpackages="false" static="false" />
-          </value>
-        </option>
-        <option name="IMPORT_LAYOUT_TABLE">
-          <value>
-            <package name="javax" withSubpackages="true" static="false" />
-            <package name="java" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="org.bukkit" withSubpackages="true" static="false" />
-            <package name="net.minecraft" withSubpackages="true" static="false" />
-            <emptyLine />
-            <package name="" withSubpackages="true" static="false" />
-            <package name="" withSubpackages="true" static="true" />
-          </value>
-        </option>
-        <XML>
-          <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
-        </XML>
-        <codeStyleSettings language="JAVA">
-          <option name="BRACE_STYLE" value="2" />
-          <option name="CLASS_BRACE_STYLE" value="2" />
-          <option name="METHOD_BRACE_STYLE" value="2" />
-          <option name="ELSE_ON_NEW_LINE" value="true" />
-          <option name="WHILE_ON_NEW_LINE" value="true" />
-          <option name="CATCH_ON_NEW_LINE" value="true" />
-          <option name="FINALLY_ON_NEW_LINE" value="true" />
-          <option name="ENUM_CONSTANTS_WRAP" value="2" />
-          <indentOptions>
-            <option name="USE_TAB_CHARACTER" value="true" />
-          </indentOptions>
-        </codeStyleSettings>
-      </value>
-    </option>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Mineplex" />
-  </component>
-</project>
--- a/Plugins/.idea/compiler.xml
+++ b/Plugins/.idea/compiler.xml
@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <option name="DEFAULT_COMPILER" value="Javac" />
-    <excludeFromCompile>
-      <directory url="file://$PROJECT_DIR$/Nautilus.Game.PvP" includeSubdirectories="true" />
-      <directory url="file://$PROJECT_DIR$/Mineplex.ServerMonitor" includeSubdirectories="true" />
-    </excludeFromCompile>
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-      <profile default="false" name="Annotation profile for bungee" enabled="true">
-        <sourceOutputDir name="target/generated-sources/annotations" />
-        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
-        <outputRelativeToContentRoot value="true" />
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-  <component name="JavacSettings">
-    <option name="GENERATE_NO_WARNINGS" value="true" />
-  </component>
-</project>
--- a/Plugins/.idea/dataSources.xml
+++ b/Plugins/.idea/dataSources.xml
@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="DataSourceManagerImpl" format="xml" hash="3221233088">
-    <data-source source="LOCAL" name="Mineplex" uuid="14dfc55d-5343-47c4-ab24-76a055b8059e">
-      <driver-ref>mysql</driver-ref>
-      <synchronize>true</synchronize>
-      <jdbc-driver>com.mysql.jdbc.Driver</jdbc-driver>
-      <jdbc-url>jdbc:mysql://db.mineplex.com:3306/Account</jdbc-url>
-      <driver-properties>
-        <property name="zeroDateTimeBehavior" value="convertToNull" />
-        <property name="tinyInt1isBit" value="false" />
-        <property name="characterEncoding" value="utf8" />
-        <property name="characterSetResults" value="utf8" />
-        <property name="yearIsDateType" value="false" />
-      </driver-properties>
-    </data-source>
-  </component>
-</project>
--- a/Plugins/.idea/encodings.xml
+++ b/Plugins/.idea/encodings.xml
@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Encoding" useUTFGuessing="true" native2AsciiForPropertiesFiles="false">
-    <file url="PROJECT" charset="UTF-8" />
-  </component>
-</project>
--- a/Plugins/.idea/libraries/BungeeCord.xml
+++ b/Plugins/.idea/libraries/BungeeCord.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="BungeeCord">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/BungeeCord.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/NoCheatPlus.xml
+++ b/Plugins/.idea/libraries/NoCheatPlus.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="NoCheatPlus">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/NoCheatPlus.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/commons_codec.xml
+++ b/Plugins/.idea/libraries/commons_codec.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-codec">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/commons-codec-1.6.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/commons_dbcp2.xml
+++ b/Plugins/.idea/libraries/commons_dbcp2.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-dbcp2">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/commons-dbcp2-2.0.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/commons_io.xml
+++ b/Plugins/.idea/libraries/commons_io.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-io">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/commons-io-2.4.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/commons_logging.xml
+++ b/Plugins/.idea/libraries/commons_logging.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-logging">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/commons-logging-1.1.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/commons_pool2.xml
+++ b/Plugins/.idea/libraries/commons_pool2.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="commons-pool2">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/commons-pool2-2.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/craftbukkit.xml
+++ b/Plugins/.idea/libraries/craftbukkit.xml
@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="craftbukkit">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/craftbukkit.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="https://hub.spigotmc.org/javadocs/spigot/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/Libraries/craftbukkit.jar!/" />
-    </SOURCES>
-  </library>
-</component>
--- a/Plugins/.idea/libraries/gson.xml
+++ b/Plugins/.idea/libraries/gson.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="gson">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/gson-2.2.1.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/httpclient.xml
+++ b/Plugins/.idea/libraries/httpclient.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="httpclient">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/httpclient-4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/httpcore.xml
+++ b/Plugins/.idea/libraries/httpcore.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="httpcore">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/httpcore-4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/jedis.xml
+++ b/Plugins/.idea/libraries/jedis.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="jedis">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/jedis-2.4.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/jooq.xml
+++ b/Plugins/.idea/libraries/jooq.xml
@ -1,13 +0,0 @@
-<component name="libraryTable">
-  <library name="jooq">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/jooq-3.5.2.jar!/" />
-    </CLASSES>
-    <JAVADOC>
-      <root url="jar://$PROJECT_DIR$/Libraries/jooq-3.5.2-javadoc.jar!/" />
-    </JAVADOC>
-    <SOURCES>
-      <root url="jar://$PROJECT_DIR$/Libraries/jooq-3.5.2-sources.jar!/" />
-    </SOURCES>
-  </library>
-</component>
--- a/Plugins/.idea/libraries/jooq_codegen.xml
+++ b/Plugins/.idea/libraries/jooq_codegen.xml
@ -1,11 +0,0 @@
-<component name="libraryTable">
-  <library name="jooq-codegen">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/jooq-3.5.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Libraries/jooq-codegen-3.5.2.jar!/" />
-      <root url="jar://$PROJECT_DIR$/Libraries/jooq-meta-3.5.2.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/libraries/mysql_connector.xml
+++ b/Plugins/.idea/libraries/mysql_connector.xml
@ -1,9 +0,0 @@
-<component name="libraryTable">
-  <library name="mysql-connector">
-    <CLASSES>
-      <root url="jar://$PROJECT_DIR$/Libraries/mysql-connector-java-5.1.32-bin.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>
--- a/Plugins/.idea/misc.xml
+++ b/Plugins/.idea/misc.xml
@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-    <list size="1">
-      <item index="0" class="java.lang.String" itemvalue="org.bukkit.event.EventHandler" />
-    </list>
-  </component>
-  <component name="IdProvider" IDEtalkID="7E81636CD93857493DFE224533ECF492" />
-  <component name="MavenProjectsManager">
-    <option name="ignoredFiles">
-      <set>
-        <option value="$PROJECT_DIR$/ParkerFactions/common/pom.xml" />
-        <option value="$PROJECT_DIR$/ParkerFactions/gameplay/pom.xml" />
-        <option value="$PROJECT_DIR$/ParkerFactions/pom.xml" />
-      </set>
-    </option>
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
--- a/Plugins/.idea/modules.xml
+++ b/Plugins/.idea/modules.xml
@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/Classpath.Dummy/Classpath.Dummy.iml" filepath="$PROJECT_DIR$/Classpath.Dummy/Classpath.Dummy.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/JedisTest/JedisTest.iml" filepath="$PROJECT_DIR$/JedisTest/JedisTest.iml" group="Legacy" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml" filepath="$PROJECT_DIR$/Mineplex.Bungee.Mineplexer/Mineplex.Bungee.Mineplexer.iml" group="Bungee" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Cache/Mineplex.Cache.iml" filepath="$PROJECT_DIR$/Mineplex.Cache/Mineplex.Cache.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Core/Mineplex.Core.iml" filepath="$PROJECT_DIR$/Mineplex.Core/Mineplex.Core.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Core.Common/Mineplex.Core.Common.iml" filepath="$PROJECT_DIR$/Mineplex.Core.Common/Mineplex.Core.Common.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Database/Mineplex.Database.iml" filepath="$PROJECT_DIR$/Mineplex.Database/Mineplex.Database.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Game.Clans/Mineplex.Game.Clans.iml" filepath="$PROJECT_DIR$/Mineplex.Game.Clans/Mineplex.Game.Clans.iml" group="Clans" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml" filepath="$PROJECT_DIR$/Mineplex.Game.Clans.Core/Mineplex.Game.Clans.Core.iml" group="Clans" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Hub/Mineplex.Hub.iml" filepath="$PROJECT_DIR$/Mineplex.Hub/Mineplex.Hub.iml" group="Other" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.MapParser/Mineplex.MapParser.iml" filepath="$PROJECT_DIR$/Mineplex.MapParser/Mineplex.MapParser.iml" group="Other" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml" filepath="$PROJECT_DIR$/Mineplex.Minecraft.Game.ClassCombat/Mineplex.Minecraft.Game.ClassCombat.iml" group="Game" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml" filepath="$PROJECT_DIR$/Mineplex.Minecraft.Game.Core/Mineplex.Minecraft.Game.Core.iml" group="Game" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" filepath="$PROJECT_DIR$/Mineplex.ServerData/Mineplex.ServerData.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" filepath="$PROJECT_DIR$/Mineplex.ServerMonitor/Mineplex.ServerMonitor.iml" group="Core" />
-      <module fileurl="file://$PROJECT_DIR$/Mineplex.Votifier/Mineplex.Votifier.iml" filepath="$PROJECT_DIR$/Mineplex.Votifier/Mineplex.Votifier.iml" group="Other" />
-      <module fileurl="file://$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" filepath="$PROJECT_DIR$/Nautilus.Game.Arcade/Nautilus.Game.Arcade.iml" group="Game" />
-      <module fileurl="file://$PROJECT_DIR$/Nautilus.Game.PvP/Nautilus.Game.PvP.iml" filepath="$PROJECT_DIR$/Nautilus.Game.PvP/Nautilus.Game.PvP.iml" group="Legacy" />
-    </modules>
-  </component>
-</project>
--- a/Plugins/.idea/runConfigurations/Arcade.xml
+++ b/Plugins/.idea/runConfigurations/Arcade.xml
@ -1,29 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Arcade" type="Application" factoryName="Application" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="org.bukkit.craftbukkit.Main" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../Testing/Arcade" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="Classpath.Dummy" />
-    <envs />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="Nautilus.Game.Arcade:test" />
-      </option>
-    </method>
-  </configuration>
-</component>
--- a/Plugins/.idea/runConfigurations/Bungee.xml
+++ b/Plugins/.idea/runConfigurations/Bungee.xml
@ -1,31 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Bungee" type="Application" factoryName="Application" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="net.md_5.bungee.Bootstrap" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../Testing/Bungee" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="Mineplex.Bungee.Mineplexer" />
-    <envs />
-    <RunnerSettings RunnerId="Cover" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Cover" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="Mineplex.Bungee.Mineplexer:test" />
-      </option>
-    </method>
-  </configuration>
-</component>
--- a/Plugins/.idea/runConfigurations/Clans.xml
+++ b/Plugins/.idea/runConfigurations/Clans.xml
@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Clans" type="Application" factoryName="Application" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="org.bukkit.craftbukkit.Main" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../Testing/Clans" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="Classpath.Dummy" />
-    <envs />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <ConfigurationWrapper RunnerId="Debug" />
-    <method>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="Mineplex.Game.Clans:test" />
-      </option>
-    </method>
-  </configuration>
-</component>
--- a/Plugins/.idea/runConfigurations/Database.xml
+++ b/Plugins/.idea/runConfigurations/Database.xml
@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Database" type="Application" factoryName="Application" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="org.jooq.util.GenerationTool" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="/jOOQConfig.xml" />
-    <option name="WORKING_DIRECTORY" value="file://$MODULE_DIR$" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="Mineplex.Database" />
-    <envs />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="Make" enabled="false" />
-    </method>
-  </configuration>
-</component>
--- a/Plugins/.idea/runConfigurations/Hub.xml
+++ b/Plugins/.idea/runConfigurations/Hub.xml
@ -1,31 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Hub" type="Application" factoryName="Application" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="org.bukkit.craftbukkit.Main" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../Testing/Hub" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="Classpath.Dummy" />
-    <envs />
-    <RunnerSettings RunnerId="Cover" />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <RunnerSettings RunnerId="Run" />
-    <ConfigurationWrapper RunnerId="Cover" />
-    <ConfigurationWrapper RunnerId="Debug" />
-    <ConfigurationWrapper RunnerId="Run" />
-    <method>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="Mineplex.Hub:test" />
-      </option>
-    </method>
-  </configuration>
-</component>
--- a/Plugins/.idea/runConfigurations/MapParser.xml
+++ b/Plugins/.idea/runConfigurations/MapParser.xml
@ -1,27 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="MapParser" type="Application" factoryName="Application" singleton="true">
-    <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" />
-    <option name="MAIN_CLASS_NAME" value="org.bukkit.craftbukkit.Main" />
-    <option name="VM_PARAMETERS" value="" />
-    <option name="PROGRAM_PARAMETERS" value="" />
-    <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/../Testing/MapParser" />
-    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-    <option name="ALTERNATIVE_JRE_PATH" value="" />
-    <option name="ENABLE_SWING_INSPECTOR" value="false" />
-    <option name="ENV_VARIABLES" />
-    <option name="PASS_PARENT_ENVS" value="true" />
-    <module name="Classpath.Dummy" />
-    <envs />
-    <RunnerSettings RunnerId="Debug">
-      <option name="DEBUG_PORT" value="" />
-      <option name="TRANSPORT" value="0" />
-      <option name="LOCAL" value="true" />
-    </RunnerSettings>
-    <ConfigurationWrapper RunnerId="Debug" />
-    <method>
-      <option name="BuildArtifacts" enabled="true">
-        <artifact name="Mineplex.MapParser:test" />
-      </option>
-    </method>
-  </configuration>
-</component>
--- a/Plugins/.idea/scopes/scope_settings.xml
+++ b/Plugins/.idea/scopes/scope_settings.xml
@ -1,5 +0,0 @@
-<component name="DependencyValidationManager">
-  <state>
-    <option name="SKIP_IMPORT_STATEMENTS" value="false" />
-  </state>
-</component>
--- a/Plugins/.idea/uiDesigner.xml
+++ b/Plugins/.idea/uiDesigner.xml
@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
-
--- a/Plugins/.idea/vcs.xml
+++ b/Plugins/.idea/vcs.xml
@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
-  </component>
-</project>
-
--- a/Plugins/BuildFiles/EnjinTranslator.xml
+++ b/Plugins/BuildFiles/EnjinTranslator.xml
@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-   <project name="loc" default="EnjinTranslator" basedir=".">
-	<target name ="EnjinTranslator" description="EnjinTranslator">
-		<jar jarfile="../bin/EnjinTranslator.jar">
-			<fileset dir="../Mineplex.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Database/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.PlayerCache/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<fileset dir="../Mineplex.EnjinTranslator/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.EnjinTranslator">
-				<include name="*.yml"/>
-			</fileset>
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/jooq-3.5.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-		</jar>
-		<copy file="../bin/EnjinTranslator.jar" todir="../../Testing/EnjinTranslator/plugins"/>
-	</target>
-    </project>
--- a/Plugins/BuildFiles/common.xml
+++ b/Plugins/BuildFiles/common.xml
@ -1,540 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-   <project name="loc" default="default" basedir=".">
-    <property name="lib.dir"     value="../Libraries"/>
-    <path id="classpath">
-        <fileset dir="${lib.dir}" includes="**/*.jar"/>
-    </path>
-	<target name="compileArcade1" description="Arcade Compilation Step 1">
-		<javac srcdir="../Mineplex.Core.Common/src" destdir="../Mineplex.Core.Common/bin" classpathref="classpath"/>
-		<jar jarfile="../bin/Mineplex.Core.Common.jar">
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-		</jar>
-		<copy file="../bin/Mineplex.Core.Common.jar" todir="../Libraries"/>
-	</target>
-	<target name="compileArcade2" description="Arcade Compilation Step 2">
-		<path id="classpathCommon">
-			<fileset dir="../Libraries" includes="**/*.jar"/>
-		</path>
-		<javac srcdir="../Mineplex.ServerData/src" destdir="../Mineplex.ServerData/bin" classpathref="classpathCommon"/>
-		<jar jarfile="../bin/Mineplex.ServerData.jar">
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-		</jar>
-		<copy file="../bin/Mineplex.ServerData.jar" todir="../Libraries"/>
-	</target>
-	<target name="compileArcade3" description="Arcade Compilation Step 3">
-		<path id="classpathCommon">
-			<fileset dir="../Libraries" includes="**/*.jar"/>
-		</path>
-		<javac srcdir="../Mineplex.Database/src" destdir="../Mineplex.Database/bin" classpathref="classpathCommon"/>
-		<jar jarfile="../bin/Mineplex.Database.jar">
-			<fileset dir="../Mineplex.Database/bin">
-				<include name="**/*.class"/>
-			</fileset>
-		</jar>
-		<copy file="../bin/Mineplex.Database.jar" todir="../Libraries"/>
-	</target>
-	<target name="compileArcade4" description="Arcade Compilation Step 4">
-		<path id="classpathCommon">
-			<fileset dir="../Libraries" includes="**/*.jar"/>
-		</path>
-		<javac srcdir="../Mineplex.Core/src" destdir="../Mineplex.Core/bin" classpathref="classpathCommon"/>
-		<jar jarfile="../bin/Mineplex.Core.jar">
-			<fileset dir="../Mineplex.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-		</jar>
-		<copy file="../bin/Mineplex.Core.jar" todir="../Libraries"/>
-	</target>
-	<target name="compileArcade" description="Arcade Compilation Step #">
-	</target>
-    <target name="compileArcade5" description="Arcade Compilation Step 5">
-		<path id="classpathCommon">
-			<fileset dir="../Libraries" includes="**/*.jar"/>
-		</path>
-		<javac srcdir="../Mineplex.Minecraft.Game.Core/src" destdir="../Mineplex.Minecraft.Game.Core/bin" classpathref="classpathCommon"/>
-		<javac srcdir="../Mineplex.Minecraft.Game.ClassCombat/src" destdir="../Mineplex.Minecraft.Game.ClassCombat/bin" classpathref="classpathCommon"/>
-		<javac srcdir="../Nautilus.Game.Arcade/src" destdir="../Nautilus.Game.Arcade/bin" classpathref="classpathCommon"/>
-    </target>
-	<target name ="Arcade" description="Arcade">
-		<jar jarfile="../bin/Arcade.jar">
-			<fileset dir="../Nautilus.Game.Arcade/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-			<fileset dir="../Mineplex.Minecraft.Game.ClassCombat/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Minecraft.Game.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Database/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Nautilus.Game.Arcade">
-				<include name="*.yml"/>
-			</fileset>
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Cache/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/jooq-3.5.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-		</jar>
-		<copy file="../bin/Arcade.jar" todir="../../Testing/Arcade/plugins"/>
-	</target>
-	<target name="compileHub" description="Hub Compilation">
-		<javac srcdir="../Mineplex.Core.Common/src" destdir="../Mineplex.Core.Common/bin" classpathref="classpath"/>
-		<jar jarfile="../bin/Mineplex.Core.Common.jar">
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-		</jar>
-		<copy file="../bin/Mineplex.Core.Common.jar" todir="../Libraries"/>
-		<path id="classpathCommon">
-			<fileset dir="../Libraries" includes="**/*.jar"/>
-		</path>
-		<javac srcdir="../Mineplex.Core/src" destdir="../Mineplex.Core/bin" classpathref="classpathCommon"/>
-		<jar jarfile="../bin/Mineplex.Core.jar">
-			<fileset dir="../Mineplex.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-		</jar>
-		<copy file="../bin/Mineplex.Core.jar" todir="../Libraries"/>
-		<path id="classpathCommon">
-			<fileset dir="../Libraries" includes="**/*.jar"/>
-		</path>
-		<javac srcdir="../Mineplex.Minecraft.Game.Core/src" destdir="../Mineplex.Minecraft.Game.Core/bin" classpathref="classpathCommon"/>
-		<javac srcdir="../Mineplex.Minecraft.Game.ClassCombat/src" destdir="../Mineplex.Minecraft.Game.ClassCombat/bin" classpathref="classpathCommon"/>
-		<javac srcdir="../Mineplex.Database/src" destdir="../Mineplex.Database/bin" classpathref="classpathCommon"/>
-		<javac srcdir="../Mineplex.ServerData/src" destdir="../Mineplex.ServerData/bin" classpathref="classpathCommon"/>
-		<javac srcdir="../Mineplex.Hub/src" destdir="../Mineplex.Hub/bin" classpathref="classpathCommon"/>
-    </target>
-	<target name ="Hub" description="Hub">
-		<jar jarfile="../bin/Hub.jar">
-			<fileset dir="../Mineplex.Hub/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-			<fileset dir="../Mineplex.Minecraft.Game.ClassCombat/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Minecraft.Game.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-            <fileset dir="../Mineplex.Game.Clans.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Hub">
-				<include name="*.yml"/>
-			</fileset>
-			<fileset dir="../Mineplex.Database/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Cache/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 
-			<zipfileset src="../Libraries/commons-io-2.4.jar" />
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/jooq-3.5.2.jar" /> 
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-		</jar>
-		<copy file="../bin/Hub.jar" todir="../../Testing/Hub/plugins"/>
-	</target>
-	<target name ="Clans" description="Clans">
-		<jar jarfile="../bin/Clans.jar">
-			<fileset dir="../Mineplex.Game.Clans/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-            <fileset dir="../Mineplex.Game.Clans.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Minecraft.Game.ClassCombat/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Minecraft.Game.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Database/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Game.Clans">
-				<include name="*.yml"/>
-			</fileset>
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Cache/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/jooq-3.5.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-		</jar>
-		<copy file="../bin/Clans.jar" todir="../../Testing/Clans/plugins"/>
-	</target>
-	<target name ="StaffServer" description="StaffServer">
-		<jar jarfile="../bin/StaffServer.jar">
-			<fileset dir="../Mineplex.StaffServer/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-			<fileset dir="../Mineplex.StaffServer">
-				<include name="*.yml"/>
-			</fileset>
-			<fileset dir="../Mineplex.Database/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.Cache/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/jooq-3.5.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-		</jar>
-		<copy file="../bin/StaffServer.jar" todir="../../Testing/StaffServer/plugins"/>
-	</target>
-	<target name ="MapParser" description="MapParser">
-		<jar jarfile="../bin/MapParser.jar">
-			<fileset dir="../Mineplex.MapParser/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-			
-			<fileset dir="../Mineplex.MapParser">
-				<include name="*.yml"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-		</jar>
-		<copy file="../bin/MapParser.jar" todir="../../Testing/Build/plugins"/>
-	</target>
-	<target name="NautilusCraftBukkit2" description="NautilusCraftBukkit2">
-		<mkdir dir="../bin/craftbukkit_temp" />
-		<delete file="../bin/craftbukkit.jar" />
-		<unzip src="../Libraries/craftbukkit_official.jar" dest="../bin/craftbukkit_temp" />
-		<touch datetime="01/31/1981 01:00:00 AM">
-			<fileset dir="../bin/craftbukkit_temp"/>
-		</touch>
-		<copy todir="../bin/craftbukkit_temp" overwrite="true">
-			<fileset dir="../Nautilus.Core.CraftBukkit/bin">
-				<include name="**/*.class"/>
-			</fileset>
-		</copy>
-		
-		<jar jarfile="../bin/craftbukkit.jar">
-			<fileset dir="../bin/craftbukkit_temp" />
-			<manifest>
-				<attribute name="Main-Class" value="org.bukkit.craftbukkit.Main" />
-			</manifest>
-			<zipfileset src="../Libraries/jopt-simple-3.2.jar" />
-		</jar>
-		<copy file="../bin/craftbukkit.jar" todir="../Libraries/"/>
-		<delete dir="../bin/craftbukkit_temp" />
-	</target>
-	<target name ="Mineplexer" description="Mineplexer">
-		<jar jarfile="../bin/Mineplexer.jar">
-			<fileset dir="../Mineplex.Bungee.Mineplexer/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<fileset dir="../Mineplex.Bungee.Mineplexer">
-				<include name="*.yml"/>
-			</fileset>
-			
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<fileset dir="../Mineplex.Cache/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/commons-io-2.4.jar" />
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" />
-			<zipfileset src="../Libraries/jooq-3.5.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" />
-		</jar>
-		<copy file="../bin/Mineplexer.jar" todir="../../Testing/Proxy/plugins"/>
-	</target>
-	<target name ="DDoSProtectionSwitcher" description="DDoSProtectionSwitcher">
-		<jar jarfile="../bin/DDoSProtectionSwitcher.jar">
-			<fileset dir="../Mineplex.DDoSProtectionSwitcher/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/mysql.zip" />
-			
-			<manifest>
-			      <attribute name="Main-Class"
-			            value="mineplex.ddos.DDoSProtectionSwitcher"/>
-    			</manifest>
-    			
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/javax.mail.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-		</jar>
-		<copy file="../bin/DDoSProtectionSwitcher.jar" todir="../../Testing/DDoSProtectionSwitcher/"/>
-	</target>
-	<target name ="BungeeRotator" description="BungeeRotator">
-		<jar jarfile="../bin/BungeeRotator.jar">
-			<fileset dir="../Mineplex.BungeeRotator/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/mysql.zip" />
-			
-			<manifest>
-			      <attribute name="Main-Class"
-			            value="mineplex.bungee.BungeeRotator"/>
-    			</manifest>
-    			
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/jooq-3.5.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-			<zipfileset src="../Libraries/commons-dbcp2-2.0.1.jar" />
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 
-		</jar>
-		<copy file="../bin/BungeeRotator.jar" todir="../../Testing/BungeeRotator/"/>
-	</target>
-	<target name ="ServerMonitor" description="ServerMonitor">
-		<jar jarfile="../bin/ServerMonitor.jar">
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-			<fileset dir="../Mineplex.ServerMonitor/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<fileset dir="../Mineplex.ServerData/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/mysql.zip" />
-			
-			<manifest>
-			      <attribute name="Main-Class"
-			            value="mineplex.servermonitor.ServerMonitor"/>
-    			</manifest>
-    			
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-			<zipfileset src="../Libraries/jedis-2.4.2.jar" /> 
-			<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-		</jar>
-		<copy file="../bin/ServerMonitor.jar" todir="../../Testing/ServerMonitor/"/>
-	</target>
-		<target name ="ChestConverter" description="ChestConverter">
-			<jar jarfile="../bin/TaskConverter.jar">
-				<fileset dir="../Mineplex.Core.Common/bin">
-					<include name="**/*.class"/>
-					<include name="**/*.png"/>
-				</fileset>
-				<fileset dir="../Mineplex.ChestConverter/bin">
-					<include name="**/*.class"/>
-				</fileset>
-
-				<zipfileset src="../Libraries/mysql.zip" />
-				
-				<manifest>
-				      <attribute name="Main-Class"
-				            value="mineplex.chestConverter.ChestConverter"/>
-	    			</manifest>
-	    			
-				<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-				<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-				<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-				<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-				<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-				<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-				<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-				<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-			</jar>
-			<copy file="../bin/TaskConverter.jar" todir="../../Testing/ChestConverter/"/>
-	</target>
-	<target name ="PetConverter" description="PetConverter">
-				<jar jarfile="../bin/PetConverter.jar">
-					<fileset dir="../Mineplex.Core.Common/bin">
-						<include name="**/*.class"/>
-						<include name="**/*.png"/>
-					</fileset>
-					<fileset dir="../Mineplex.PetConverter/bin">
-						<include name="**/*.class"/>
-					</fileset>
-	
-					<zipfileset src="../Libraries/mysql.zip" />
-					
-					<manifest>
-					      <attribute name="Main-Class"
-					            value="mineplex.chestConverter.PetConverter"/>
-		    			</manifest>
-		    			
-					<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-					<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-					<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-					<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-					<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-					<zipfileset src="../Libraries/craftbukkit.jar" />
-					<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-					<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-					<zipfileset src="../Libraries/commons-pool2-2.2.jar" /> 
-				</jar>
-				<copy file="../bin/PetConverter.jar" todir="../../Testing/PetConverter/"/>
-	</target>
-	<target name ="Queuer" description="Queuer">
-		<jar jarfile="../bin/Queuer.jar">
-			<fileset dir="../Mineplex.Core.Common/bin">
-				<include name="**/*.class"/>
-				<include name="**/*.png"/>
-			</fileset>
-			<fileset dir="../Mineplex.Queuer/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/mysql.zip" />
-			
-			<manifest>
-			      <attribute name="Main-Class"
-			            value="mineplex.queuer.Queuer"/>
-    			</manifest>
-    			
-			<zipfileset src="../Libraries/httpclient-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpcore-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpclient-cache-4.2.jar" /> 
-			<zipfileset src="../Libraries/httpmime-4.2.jar" /> 
-			<zipfileset src="../Libraries/gson-2.2.1.jar" /> 
-			<zipfileset src="../Libraries/commons-logging-1.1.1.jar" /> 	
-			<zipfileset src="../Libraries/commons-codec-1.6.jar" />
-		</jar>
-		<copy file="../bin/Queuer.jar" todir="../../Testing/Queuer/"/>
-	</target>
-	<target name ="ServerStatifier" description="ServerStatifier">
-		<jar jarfile="../bin/ServerStatifier.jar">
-			<fileset dir="../Mineplex.ServerStatifier/bin">
-				<include name="**/*.class"/>
-			</fileset>
-			
-			<zipfileset src="../Libraries/mysql.zip" />
-			
-			<manifest>
-			      <attribute name="Main-Class"
-			            value="mineplex.serverstatifier.ServerStatifier"/>
-    			</manifest>
-		</jar>
-		<copy file="../bin/ServerStatifier.jar" todir="../../Testing/ServerStatifier/"/>
-	</target>
-</project>
--- a/Plugins/Classpath.Dummy/Classpath.Dummy.iml
+++ b/Plugins/Classpath.Dummy/Classpath.Dummy.iml
@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="craftbukkit" level="project" />
-    <orderEntry type="library" name="commons-dbcp2" level="project" />
-    <orderEntry type="library" name="commons-pool2" level="project" />
-    <orderEntry type="library" name="commons-logging" level="project" />
-  </component>
-</module>
--- a/Plugins/JedisTest/JedisTest.iml
+++ b/Plugins/JedisTest/JedisTest.iml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="jedis" level="project" />
-    <orderEntry type="library" name="commons-pool2" level="project" />
-  </component>
-</module>
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/Main.java
@ -1,93 +0,0 @@
-package ca.phinary.jedistest;
-
-import javax.swing.*;
-
-import java.awt.event.WindowEvent;
-import java.awt.event.WindowListener;
-
-import ca.phinary.jedistest.gui.ChatFrame;
-import ca.phinary.jedistest.model.JedisChat;
-
-public class Main
-{
-	public static void main(String[] args)
-	{
-		SwingUtilities.invokeLater(new Runnable()
-		{
-			@Override
-			public void run()
-			{
-				try
-				{
-					UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
-				}
-				catch (ClassNotFoundException e)
-				{
-					e.printStackTrace();
-				}
-				catch (InstantiationException e)
-				{
-					e.printStackTrace();
-				}
-				catch (IllegalAccessException e)
-				{
-					e.printStackTrace();
-				}
-				catch (UnsupportedLookAndFeelException e)
-				{
-					e.printStackTrace();
-				}
-
-				ChatFrame chatFrame = new ChatFrame();
-				final JedisChat jedisChat = new JedisChat(chatFrame, "phinaryTest", "10.33.53.16", 6379);
-
-				chatFrame.addWindowListener(new WindowListener()
-				{
-					@Override
-					public void windowOpened(WindowEvent e)
-					{
-
-					}
-
-					@Override
-					public void windowClosing(WindowEvent e)
-					{
-
-					}
-
-					@Override
-					public void windowClosed(WindowEvent e)
-					{
-						jedisChat.close();
-					}
-
-					@Override
-					public void windowIconified(WindowEvent e)
-					{
-
-					}
-
-					@Override
-					public void windowDeiconified(WindowEvent e)
-					{
-
-					}
-
-					@Override
-					public void windowActivated(WindowEvent e)
-					{
-
-					}
-
-					@Override
-					public void windowDeactivated(WindowEvent e)
-					{
-
-					}
-				});
-			}
-		});
-
-	}
-
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Chat.java
@ -1,8 +0,0 @@
-package ca.phinary.jedistest.api;
-
-public interface Chat
-{
-	public void addListener(ChatListener chatListener);
-
-	public void clearListeners();
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/api/ChatListener.java
@ -1,6 +0,0 @@
-package ca.phinary.jedistest.api;
-
-public interface ChatListener
-{
-	public void onChat(String message);
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Console.java
@ -1,6 +0,0 @@
-package ca.phinary.jedistest.api;
-
-public interface Console
-{
-	public void println(String line);
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/api/Messenger.java
@ -1,9 +0,0 @@
-package ca.phinary.jedistest.api;
-
-public interface Messenger
-{
-	public Chat getChat();
-
-	public Console getConsole();
-
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatFrame.java
@ -1,42 +0,0 @@
-package ca.phinary.jedistest.gui;
-
-import javax.swing.*;
-
-import java.awt.*;
-
-import ca.phinary.jedistest.api.Chat;
-import ca.phinary.jedistest.api.Console;
-import ca.phinary.jedistest.api.Messenger;
-
-public class ChatFrame extends JFrame implements Messenger
-{
-	private ConsolePane _console;
-	private ChatPane _chat;
-
-	public ChatFrame()
-	{
-		setLayout(new BorderLayout());
-
-		_console = new ConsolePane();
-		_chat = new ChatPane(this);
-
-		add(_console, BorderLayout.CENTER);
-		add(_chat, BorderLayout.SOUTH);
-
-		setTitle("Phinary's Redis Chat");
-		setDefaultCloseOperation(WindowConstants.DISPOSE_ON_CLOSE);
-		pack();
-		setLocationRelativeTo(null);
-		setVisible(true);
-	}
-
-	public Console getConsole()
-	{
-		return _console;
-	}
-
-	public Chat getChat()
-	{
-		return _chat;
-	}
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ChatPane.java
@ -1,60 +0,0 @@
-package ca.phinary.jedistest.gui;
-
-import javax.swing.*;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.util.ArrayList;
-
-import ca.phinary.jedistest.api.Chat;
-import ca.phinary.jedistest.api.ChatListener;
-
-public class ChatPane extends JPanel implements ActionListener, Chat
-{
-	private ArrayList<ChatListener> _chatListeners;
-
-	private JTextField _textField;
-	private JButton _sendButton;
-
-	public ChatPane(JFrame frame)
-	{
-		_chatListeners = new ArrayList<ChatListener>();
-
-		_textField = new JTextField();
-		_sendButton = new JButton("Send");
-
-		setBorder(new EmptyBorder(5, 10, 5, 10));
-		setLayout(new BorderLayout());
-
-		add(_textField, BorderLayout.CENTER);
-		add(_sendButton, BorderLayout.EAST);
-
-		_sendButton.addActionListener(this);
-		frame.getRootPane().setDefaultButton(_sendButton);
-	}
-
-	@Override
-	public void actionPerformed(ActionEvent e)
-	{
-		String text = _textField.getText();
-		for (ChatListener listener : _chatListeners)
-		{
-			listener.onChat(text);
-		}
-		_textField.setText("");
-	}
-
-	@Override
-	public void addListener(ChatListener chatListener)
-	{
-		_chatListeners.add(chatListener);
-	}
-
-	@Override
-	public void clearListeners()
-	{
-		_chatListeners.clear();
-	}
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/gui/ConsolePane.java
@ -1,33 +0,0 @@
-package ca.phinary.jedistest.gui;
-
-import javax.swing.*;
-import javax.swing.border.TitledBorder;
-import java.awt.*;
-
-import ca.phinary.jedistest.api.Console;
-
-public class ConsolePane extends JPanel implements Console
-{
-	private JScrollPane _scrollPane;
-	private JTextArea _textArea;
-
-	public ConsolePane()
-	{
-		_textArea = new JTextArea();
-		_textArea.setEditable(false);
-		_textArea.setPreferredSize(new Dimension(800, 400));
-		_scrollPane = new JScrollPane(_textArea);
-		_scrollPane.setVerticalScrollBarPolicy(ScrollPaneConstants.VERTICAL_SCROLLBAR_ALWAYS);
-
-		setLayout(new BorderLayout());
-		setBorder(new TitledBorder("Console"));
-
-		add(_scrollPane, BorderLayout.CENTER);
-	}
-
-	public synchronized void println(String line)
-	{
-		_textArea.append(line + "\n");
-	}
-
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisChat.java
@ -1,51 +0,0 @@
-package ca.phinary.jedistest.model;
-
-import ca.phinary.jedistest.api.Messenger;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
-
-public class JedisChat
-{
-	private JedisPool _jedisPool;
-	private String _channel;
-
-	private Messenger _messenger;
-	private JedisPublisher _publisher;
-
-	public JedisChat(Messenger messenger, final String channel, String host, int port)
-	{
-		_jedisPool = new JedisPool(new JedisPoolConfig(), host, port);
-		_channel = channel;
-		_messenger = messenger;
-
-		_publisher = new JedisPublisher(messenger.getConsole(), _jedisPool, channel);
-		_messenger.getChat().addListener(_publisher);
-
-		startListen();
-	}
-
-	public void startListen()
-	{
-		_messenger.getConsole().println("Attempting to connect to redis server...");
-		try
-		{
-			final Jedis jedis = _jedisPool.getResource();
-
-			_messenger.getConsole().println("Successfully connected!");
-
-			SubscribeWorker worker = new SubscribeWorker(_messenger.getConsole(), _jedisPool, _channel);
-			worker.execute();
-
-		} catch (Exception e)
-		{
-			_messenger.getConsole().println("Failed to connect to redis server!");
-		}
-	}
-
-	public void close()
-	{
-		System.out.println("close");
-		_publisher.close();
-	}
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisPublisher.java
@ -1,93 +0,0 @@
-package ca.phinary.jedistest.model;
-
-import javax.swing.*;
-import java.net.InetAddress;
-import java.util.List;
-
-import ca.phinary.jedistest.api.ChatListener;
-import ca.phinary.jedistest.api.Console;
-import redis.clients.jedis.JedisPool;
-
-public class JedisPublisher implements ChatListener
-{
-	private Console _console;
-	private JedisPool _jedisPool;
-	private String _channelName;
-
-	public JedisPublisher(Console console, JedisPool jedisPool, String channelName)
-	{
-		_console = console;
-		_jedisPool = jedisPool;
-		_channelName = channelName;
-
-		sendConnectMessage();
-	}
-
-	@Override
-	public void onChat(String message)
-	{
-		String hostName = "Unknown";
-
-		try
-		{
-			hostName = InetAddress.getLocalHost().toString();
-		}
-		catch(Exception e) { };
-
-		message(hostName + " > " + message);
-	}
-
-	private void sendConnectMessage()
-	{
-		String hostName = "Unknown";
-
-		try
-		{
-			hostName = InetAddress.getLocalHost().toString();
-		}
-		catch(Exception e) { };
-
-		message(hostName + " has connected to the channel");
-	}
-
-	public void close()
-	{
-		String hostName = "Unknown";
-
-		try
-		{
-			hostName = InetAddress.getLocalHost().toString();
-		}
-		catch(Exception e) { };
-
-
-		message(hostName + " has disconnected from the channel");
-	}
-
-	private void message(final String text)
-	{
-		new SwingWorker<Void, String>()
-		{
-			@Override
-			protected Void doInBackground() throws Exception
-			{
-				try
-				{
-					_jedisPool.getResource().publish(_channelName, text);
-				}
-				catch (Exception e)
-				{
-					publish("Failed to send message: " + e.getMessage());
-				}
-				return null;
-			}
-
-			@Override
-			protected void process(List<String> chunks)
-			{
-				for (String s : chunks)
-					_console.println(s);
-			}
-		}.execute();
-	}
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/model/JedisSubscriber.java
@ -1,49 +0,0 @@
-package ca.phinary.jedistest.model;
-
-import redis.clients.jedis.JedisPubSub;
-
-public class JedisSubscriber extends JedisPubSub
-{
-	private SubscribeWorker _jedisWorker;
-
-	public JedisSubscriber(SubscribeWorker jedisWorker)
-	{
-		_jedisWorker = jedisWorker;
-	}
-
-	@Override
-	public void onMessage(String channel, String message)
-	{
-		_jedisWorker.onMessage(message);
-	}
-
-	@Override
-	public void onPMessage(String s, String s1, String s2)
-	{
-		System.out.println("Pmessage:" + s  + " " + s1 + " " + s2);
-	}
-
-	@Override
-	public void onSubscribe(String s, int i)
-	{
-		System.out.println("Subcribe: s " + i);
-	}
-
-	@Override
-	public void onUnsubscribe(String s, int i)
-	{
-		System.out.println("UnSubcribe: s " + i);
-	}
-
-	@Override
-	public void onPUnsubscribe(String s, int i)
-	{
-		System.out.println("PUnSubcribe: s " + i);
-	}
-
-	@Override
-	public void onPSubscribe(String s, int i)
-	{
-		System.out.println("Subcribe: s " + i);
-	}
-}
--- a/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java
+++ b/Plugins/JedisTest/src/ca/phinary/jedistest/model/SubscribeWorker.java
@ -1,56 +0,0 @@
-package ca.phinary.jedistest.model;
-
-import javax.swing.*;
-
-import java.util.List;
-
-import ca.phinary.jedistest.api.Console;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-
-public class SubscribeWorker extends SwingWorker<Void, String>
-{
-	private Console _console;
-	private JedisPool _jedisPool;
-	private JedisSubscriber _jedisSubscriber;
-	private String _channel;
-
-	public SubscribeWorker(Console console, JedisPool jedisPool, String channel)
-	{
-		_console = console;
-		_jedisPool = jedisPool;
-		_jedisSubscriber = new JedisSubscriber(this);
-		_channel = channel;
-	}
-
-	@Override
-	protected Void doInBackground() throws Exception
-	{
-		publish("Attempting to connect to channel: " + _channel);
-		try
-		{
-			Jedis j = _jedisPool.getResource();
-			publish("Successfully connected to channel!");
-			_jedisPool.getResource().subscribe(_jedisSubscriber, _channel);
-		} catch (Exception e)
-		{
-			publish("Connection to channel failed:" + e.getMessage());
-		}
-
-		return null;
-	}
-
-	public void onMessage(String s)
-	{
-		publish(s);
-	}
-
-	@Override
-	protected void process(List<String> chunks)
-	{
-		for (String s : chunks)
-		{
-			_console.println(s);
-		}
-	}
-}
--- a/Plugins/Libraries/BungeeCord.jar
+++ b/Plugins/Libraries/BungeeCord.jar
--- a/Plugins/Libraries/NoCheatPlus.jar
+++ b/Plugins/Libraries/NoCheatPlus.jar
--- a/Plugins/Libraries/TerrainControl.jar
+++ b/Plugins/Libraries/TerrainControl.jar
--- a/Plugins/Libraries/Votifier.jar
+++ b/Plugins/Libraries/Votifier.jar
--- a/Plugins/Libraries/bcprov-jdk15on-147.jar
+++ b/Plugins/Libraries/bcprov-jdk15on-147.jar
--- a/Plugins/Libraries/bukkit.jar
+++ b/Plugins/Libraries/bukkit.jar
--- a/Plugins/Libraries/commons-codec-1.6.jar
+++ b/Plugins/Libraries/commons-codec-1.6.jar
--- a/Plugins/Libraries/commons-dbcp2-2.0.1.jar
+++ b/Plugins/Libraries/commons-dbcp2-2.0.1.jar
--- a/Plugins/Libraries/commons-io-2.4.jar
+++ b/Plugins/Libraries/commons-io-2.4.jar
--- a/Plugins/Libraries/commons-lang3-3.1.jar
+++ b/Plugins/Libraries/commons-lang3-3.1.jar
--- a/Plugins/Libraries/commons-logging-1.1.1.jar
+++ b/Plugins/Libraries/commons-logging-1.1.1.jar
--- a/Plugins/Libraries/commons-pool2-2.2.jar
+++ b/Plugins/Libraries/commons-pool2-2.2.jar
--- a/Show More
+++ b/Show More