diff --git a/src/main/java/net/Indyuce/mmocore/MMOCore.java b/src/main/java/net/Indyuce/mmocore/MMOCore.java
index f2a5cfba..7f74218a 100644
--- a/src/main/java/net/Indyuce/mmocore/MMOCore.java
+++ b/src/main/java/net/Indyuce/mmocore/MMOCore.java
@@ -31,7 +31,6 @@ import net.Indyuce.mmocore.command.QuestsCommand;
 import net.Indyuce.mmocore.command.SkillsCommand;
 import net.Indyuce.mmocore.command.WaypointsCommand;
 import net.Indyuce.mmocore.command.WithdrawCommand;
-import net.Indyuce.mmocore.comp.Metrics;
 import net.Indyuce.mmocore.comp.ShopKeepersEntityHandler;
 import net.Indyuce.mmocore.comp.citizens.CitizenInteractEventListener;
 import net.Indyuce.mmocore.comp.citizens.CitizensMMOLoader;
@@ -92,6 +91,7 @@ import net.Indyuce.mmocore.manager.social.BoosterManager;
 import net.Indyuce.mmocore.manager.social.GuildManager;
 import net.Indyuce.mmocore.manager.social.PartyManager;
 import net.Indyuce.mmocore.manager.social.RequestManager;
+import net.mmogroup.mmolib.comp.Metrics;
 
 public class MMOCore extends JavaPlugin {
 	public static MMOCore plugin;
diff --git a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java
index a577ae7b..db32f015 100644
--- a/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java
+++ b/src/main/java/net/Indyuce/mmocore/listener/PlayerListener.java
@@ -14,14 +14,12 @@ import org.bukkit.event.player.PlayerQuitEvent;
 
 import com.codingforcookies.armorequip.ArmorEquipEvent;
 
-import net.Indyuce.mmocore.MMOCore;
 import net.Indyuce.mmocore.api.event.PlayerAttackEvent;
 import net.Indyuce.mmocore.api.event.PlayerCombatEvent;
 import net.Indyuce.mmocore.api.player.PlayerData;
 import net.Indyuce.mmocore.api.player.stats.PlayerStats;
 import net.Indyuce.mmocore.api.player.stats.StatType;
 import net.Indyuce.mmocore.gui.api.PluginInventory;
-import net.Indyuce.mmoitems.api.AttackResult;
 import net.mmogroup.mmolib.api.DamageType;
 
 public class PlayerListener implements Listener {
@@ -58,7 +56,8 @@ public class PlayerListener implements Listener {
 	 */
 	@EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true)
 	public void d(EntityDamageByEntityEvent event) {
-		if(event.getEntity().hasMetadata("NPC")) return;
+		if (event.getEntity().hasMetadata("NPC"))
+			return;
 		if (event.getEntity() instanceof Player)
 			PlayerData.get((Player) event.getEntity()).updateCombat();
 
@@ -100,15 +99,8 @@ public class PlayerListener implements Listener {
 	@EventHandler
 	public void h(PlayerAttackEvent event) {
 		double damage = event.getDamage();
-		double d = 1, s = 1;
-		
-		if(MMOCore.plugin.isMILoaded())
-			for (DamageType type : event.getAttackInfo().getTypes())
-				s += (net.Indyuce.mmoitems.api.player.PlayerData.get(event.getPlayer()).getStats()
-				.getStat(AttackResult.DamageType.valueOf(type.name()).getStat()) / 100);
+		double d = 1;
 
-		damage /= s;
-		
 		PlayerStats stats = event.getData().getStats();
 		for (DamageType type : event.getAttackInfo().getTypes())
 			d += (stats.getStat((StatType) type.getMMOCoreStat())) / 100;