diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
index cadaf7d307..7686f62b6a 100644
--- a/src/main/java/net/minecraft/server/World.java
+++ b/src/main/java/net/minecraft/server/World.java
@@ -720,7 +720,7 @@ public class World implements IBlockAccess {
         }
 
         // CraftBukkit start
-        if (entity instanceof EntityLiving) {
+        if (entity instanceof EntityLiving && !(entity instanceof EntityPlayer)) {
             CreatureSpawnEvent event = CraftEventFactory.callCreatureSpawnEvent((EntityLiving) entity);
             if (event.isCancelled()) {
                 return false;
@@ -1578,7 +1578,7 @@ public class World implements IBlockAccess {
         for (int i = 0; i < list.size(); ++i) {
             entity = (Entity) list.get(i);
             // CraftBukkit start
-            if (entity instanceof EntityLiving) {
+            if (entity instanceof EntityLiving && !(entity instanceof EntityPlayer)) {
                 CreatureSpawnEvent event = CraftEventFactory.callCreatureSpawnEvent((EntityLiving) entity);
                 if (event.isCancelled()) {
                     continue;