From c0a78fa6c63a918774ba24c302af76613dd4e7af Mon Sep 17 00:00:00 2001
From: Erik Broes <erikbroes@grum.nl>
Date: Fri, 1 Apr 2011 09:15:48 +0200
Subject: [PATCH] Exempt players from calling CreatureSpawn

---
 src/main/java/net/minecraft/server/World.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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;