More upstream merge

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

CraftBukkit-Patches/0009-Merge-tweaks-and-configuration.patch

@@ -1,4 +1,4 @@
-From cb54f74739ff0a97474b244cf05a7d59cfc2b0d0 Mon Sep 17 00:00:00 2001
+From c5a0b8b2d97cc9d0dce80bdfabb8e99be69a68fd Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Sat, 23 Mar 2013 09:46:33 +1100
 Subject: [PATCH] Merge tweaks and configuration
@@ -41,10 +41,10 @@ index 8343ac9..95beb11 100644
              }
          } else {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9d275b3..edf229b 100644
+index 234ea35..b7aed63 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -932,6 +932,23 @@ public abstract class World implements IBlockAccess {
+@@ -917,6 +917,23 @@ public abstract class World implements IBlockAccess {
              // Not all projectiles extend EntityProjectile, so check for Bukkit interface instead
              event = CraftEventFactory.callProjectileLaunchEvent(entity);
          }
@@ -92,5 +92,5 @@ index 7e79ba5..1545a61 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1