Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0122-Configurable-dragon-death-and-wither-spawn-sounds.patch

@@ -1,11 +1,11 @@
-From 7326c2d7d2432a8898a42b86406a383934023512 Mon Sep 17 00:00:00 2001
+From 1d656f452be97d6681875b04c4fd5142ace84c4b Mon Sep 17 00:00:00 2001
 From: drXor <mcyoungsota@gmail.com>
 Date: Sat, 29 Mar 2014 13:44:25 -0400
 Subject: [PATCH] Configurable dragon death and wither spawn sounds
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index f53b183..9a8408c 100644
+index dbf30cb..64b0992 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -550,7 +550,14 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@@ -25,10 +25,10 @@ index f53b183..9a8408c 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index 99526b9..2ba0a81 100644
+index 352f739..2c7d9f6 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
-@@ -172,7 +172,14 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
+@@ -173,7 +173,14 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
                  // CraftBukkit end
  
                  this.world.createExplosion(this, this.locX, this.locY + (double) this.getHeadHeight(), this.locZ, 7.0F, false, this.world.getGameRules().getBoolean("mobGriefing"));
@@ -66,5 +66,5 @@ index b12a086..312fa55 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1