Upstream merge

By: md_5 <git@md-5.net>

Bukkit-Patches/0009-Define-EntitySpawnEvent-and-SpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From f4c3f11329a362ba8a213030895b1cf04fe85f46 Mon Sep 17 00:00:00 2001
+From e4aaa81f0b3679aecf548da2945c84bd4af3b53d Mon Sep 17 00:00:00 2001
 From: Andy Shulman <andy.shulman@hotmail.com>
 Date: Mon, 15 Apr 2013 20:06:01 -0500
 Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Define EntitySpawnEvent and SpawnerSpawnEvent
 Defines EntitySpawnEvent and SpawnerSpawnEvent. Adds BUKKIT-267 and BUKKIT-1559
 
 diff --git a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
-index 24c4ebf..ed9c4a0 100644
+index 3055ea7..6bde0fe 100644
 --- a/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 +++ b/src/main/java/org/bukkit/event/entity/CreatureSpawnEvent.java
 @@ -4,17 +4,13 @@ import org.bukkit.Location;
@@ -57,8 +57,8 @@ index 24c4ebf..ed9c4a0 100644
 -    /**
       * Gets the type of creature being spawned.
       *
-      * @return A CreatureType value detailing the type of creature being spawned
-@@ -70,15 +49,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
+      * @return A CreatureType value detailing the type of creature being
+@@ -72,15 +51,6 @@ public class CreatureSpawnEvent extends EntityEvent implements Cancellable {
          return spawnReason;
      }
  
@@ -216,5 +216,5 @@ index 0000000..1acb3c4
 +    }
 +}
 -- 
-1.8.1.2
+1.8.3.2