diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/SkillMonitorTask.java b/src/main/java/com/gmail/nossr50/runnables/skills/SkillMonitorTask.java
index dffbba9ca..4dbc73a52 100644
--- a/src/main/java/com/gmail/nossr50/runnables/skills/SkillMonitorTask.java
+++ b/src/main/java/com/gmail/nossr50/runnables/skills/SkillMonitorTask.java
@@ -1,12 +1,8 @@
 package com.gmail.nossr50.runnables.skills;
 
-import org.bukkit.entity.Player;
-
-import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.datatypes.skills.AbilityType;
 import com.gmail.nossr50.datatypes.skills.SkillType;
-import com.gmail.nossr50.util.Misc;
 import com.gmail.nossr50.util.player.UserManager;
 import com.gmail.nossr50.util.skills.SkillUtils;
 
@@ -15,13 +11,7 @@ public class SkillMonitorTask implements Runnable {
     public void run() {
         long curTime = System.currentTimeMillis();
 
-        for (Player player : mcMMO.p.getServer().getOnlinePlayers()) {
-            if (Misc.isNPCEntity(player)) {
-                continue;
-            }
-
-            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
-
+        for (McMMOPlayer mcMMOPlayer : UserManager.getPlayers().values()) {
             /*
              * MONITOR SKILLS
              */