diff --git a/Changelog.txt b/Changelog.txt
index bf47cabb8..5480c1e3a 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,8 +1,11 @@
+Version 2.1.84
+    Added some code to make mcMMO more compatible with EpicSpawners
+
 Version 2.1.83
-    Updated hu_HU locale (thanks andris155)
+    You can no longer set party members on fire with your bow
     (FIX) Arrow Retrieval will no longer work with piercing enchant on crossbows
     WG Flags should now correctly recognize when a projectile belongs to a player and respect flag settings
-    You can no longer set party members on fire with your bow
+    Updated hu_HU locale (thanks andris155)
 
 Version 2.1.82
     Added new WG flag 'mcmmo-hardcore' if set to negative players will not be penalized by hardcore mode (if hardcore mode is enabled) it defaults to true
diff --git a/pom.xml b/pom.xml
index 10b5b8c72..2b03a980b 100755
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
-    <version>2.1.83-SNAPSHOT</version>
+    <version>2.1.84</version>
     <name>mcMMO</name>
     <url>https://github.com/mcMMO-Dev/mcMMO</url>
     <scm>
diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
index fbeca79db..c16356e70 100644
--- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
+++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java
@@ -325,7 +325,6 @@ public class EntityListener implements Listener {
             }
         }
 
-
         /* WORLD BLACKLIST CHECK */
         if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
             return;
@@ -694,7 +693,7 @@ public class EntityListener implements Listener {
      * @param event
      *            The event to watch
      */
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
+    @EventHandler(priority = EventPriority.MONITOR)
     public void onCreatureSpawn(CreatureSpawnEvent event) {
         /* WORLD BLACKLIST CHECK */
         if(WorldBlacklist.isWorldBlacklisted(event.getEntity().getWorld()))
diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
index 4b82e237f..35a5ab83b 100644
--- a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
+++ b/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java
@@ -616,7 +616,9 @@ public final class CombatUtils {
                 }
             }
 
-            if (target.hasMetadata(mcMMO.entityMetadataKey)) {
+            if (target.hasMetadata(mcMMO.entityMetadataKey)
+                    //Epic Spawners compatibility
+                    || target.hasMetadata("ES")) {
                 baseXP *= ExperienceConfig.getInstance().getSpawnedMobXpMultiplier();
             }