diff --git a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
index a8a368dc97..7fc7ace765 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftPlayer.java
@@ -1,4 +1,3 @@
-
 package org.bukkit.craftbukkit;
 
 import net.minecraft.server.EntityPlayer;
@@ -8,6 +7,7 @@ import org.bukkit.Location;
 import org.bukkit.Player;
 
 public class CraftPlayer extends CraftHumanEntity implements Player {
+
     private EntityPlayerMP entity;
 
     public CraftPlayer(CraftServer server, EntityPlayerMP entity) {
@@ -15,17 +15,26 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
         this.entity = entity;
     }
 
-    public boolean isOnline() {
+    public boolean isOp() {
         return server.getHandle().g(getName());
     }
 
+    public boolean isOnline() {
+        for (EntityPlayerMP player : server.getHandle().b) {
+            if (player.aw.equalsIgnoreCase(getName())) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     @Override
     public EntityPlayerMP getHandle() {
         return entity;
     }
 
     public void setHandle(final EntityPlayerMP entity) {
-        super.setHandle((EntityPlayer)entity);
+        super.setHandle((EntityPlayer) entity);
         this.entity = entity;
     }