1.8.patch

diff --git a/Empire/src/main/java/com/empireminecraft/LegacyEmpireCommand.java b/Empire/src/main/java/com/empireminecraft/LegacyEmpireCommand.java
index 1f8ca5b..b2b8695 100644
--- a/Empire/src/main/java/com/empireminecraft/LegacyEmpireCommand.java
+++ b/Empire/src/main/java/com/empireminecraft/LegacyEmpireCommand.java
@@ -15,7 +15,7 @@ import com.empireminecraft.systems.db.DbStatement;
 import com.empireminecraft.systems.wastelands.Wastelands;
 import com.empireminecraft.util.RegexPatterns;
 import com.empireminecraft.util.Util;
-import net.minecraft.util.org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FileUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.OfflinePlayer;
diff --git a/Empire/src/main/java/com/empireminecraft/commands/staff/ModCommands.java b/Empire/src/main/java/com/empireminecraft/commands/staff/ModCommands.java
index 9042f10..88ac083 100644
--- a/Empire/src/main/java/com/empireminecraft/commands/staff/ModCommands.java
+++ b/Empire/src/main/java/com/empireminecraft/commands/staff/ModCommands.java
@@ -37,6 +37,7 @@ import org.bukkit.entity.Player;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 import static com.empireminecraft.features.survival.mobs.CustomMob.PERMA_EFFECT_LENGTH;
 import static org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.FORCE;
@@ -160,7 +161,7 @@ public class ModCommands extends EmpireCommand {
             player.sendMessage("mobs: " + StringUtils.join(names, ", "));
             return;
         }
-        Location target = player.getTargetBlock(null, 512).getLocation();
+        Location target = player.getTargetBlock((Set<Material>)null, 512).getLocation();
         target.setY(target.getY() + 1.5);
         if (!Util.isSrStaff(player)) {
             if (!EmpireMobArena.isMobArenaFight(target)) {
diff --git a/Empire/src/main/java/com/empireminecraft/data/items/MiscItems.java b/Empire/src/main/java/com/empireminecraft/data/items/MiscItems.java
index 9675244..345429c 100644
--- a/Empire/src/main/java/com/empireminecraft/data/items/MiscItems.java
+++ b/Empire/src/main/java/com/empireminecraft/data/items/MiscItems.java
@@ -24,6 +24,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.potion.PotionEffectType;
 
 import java.sql.SQLException;
+import java.util.Set;
 
 import static com.empireminecraft.entityai.EntityTasksApi.EntityTask;
 
@@ -208,7 +209,7 @@ public class MiscItems {
         }
         @Override
         public ItemStack onUse(Player player, ItemStack item) {
-            Location target = player.getTargetBlock(null, 512).getLocation();
+            Location target = player.getTargetBlock((Set<Material>)null, 512).getLocation();
             target.setY(target.getY() + 1.5);
             ClaimedResidence res = Residence.getResidence(target);
             if (Residence.checkPerms(res, player, "build")) {
diff --git a/Empire/src/main/java/com/empireminecraft/listeners/EmpirePlayerListener.java b/Empire/src/main/java/com/empireminecraft/listeners/EmpirePlayerListener.java
index 7090af9..f8d906a 100644
--- a/Empire/src/main/java/com/empireminecraft/listeners/EmpirePlayerListener.java
+++ b/Empire/src/main/java/com/empireminecraft/listeners/EmpirePlayerListener.java
@@ -56,7 +56,7 @@ import com.empireminecraft.util.ItemUtil;
 import com.empireminecraft.util.RegexPatterns;
 import com.empireminecraft.util.Util;
 import me.asofold.bpl.simplyvanish.api.events.SimplyVanishStateEvent;
-import net.minecraft.util.com.google.common.collect.EvictingQueue;
+import com.google.common.collect.EvictingQueue;
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
diff --git a/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/LimiterListener.java b/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/LimiterListener.java
index 2ed5894..e1824dd 100644
--- a/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/LimiterListener.java
+++ b/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/LimiterListener.java
@@ -18,8 +18,8 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.block.BlockDispenseEvent;
 import org.bukkit.event.entity.CreatureSpawnEvent;
 import org.bukkit.event.entity.EntityDeathEvent;
-import org.bukkit.event.entity.SpawnTickEvent;
-import org.bukkit.event.entity.SpawnerInitiateEvent;
+import com.empireminecraft.customevents.SpawnTickEvent;
+import com.empireminecraft.customevents.SpawnerInitiateEvent;
 import org.bukkit.event.player.PlayerEggThrowEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
diff --git a/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/Prevention.java b/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/Prevention.java
index 4d755cf..290bfbf 100644
--- a/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/Prevention.java
+++ b/Empire/src/main/java/com/empireminecraft/systems/entitylimiter/Prevention.java
@@ -13,8 +13,8 @@ import org.bukkit.block.Block;
 import org.bukkit.entity.*;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.entity.CreatureSpawnEvent;
-import org.bukkit.event.entity.SpawnTickEvent;
-import org.bukkit.event.entity.SpawnerInitiateEvent;
+import com.empireminecraft.customevents.SpawnTickEvent;
+import com.empireminecraft.customevents.SpawnerInitiateEvent;
 import org.bukkit.event.player.PlayerEggThrowEvent;
 import org.bukkit.event.player.PlayerInteractEntityEvent;
 import org.bukkit.event.player.PlayerInteractEvent;
diff --git a/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java b/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java
index 8071030..833d15c 100644
--- a/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java
+++ b/Empire/src/main/java/com/empireminecraft/systems/residence/protection/ResidenceManager.java
@@ -14,7 +14,7 @@ import com.empireminecraft.util.BukkitUtil;
 import com.empireminecraft.util.RegexPatterns;
 import com.empireminecraft.util.Util;
 import com.empireminecraft.util.YMLSaveHelper;
-import net.minecraft.util.org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.apache.commons.io.filefilter.WildcardFileFilter;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.Material;