Stage 1

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

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

@@ -1,4 +1,4 @@
-From 518136605c7088117a448666a234b09d6e40b60f Mon Sep 17 00:00:00 2001
+From 3c8d3ae7d02a158f91498a5dd3bcf32283938fb8 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 9dc2d73..d023889 100644
+index 9d275b3..edf229b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -931,6 +931,23 @@ public abstract class World implements IBlockAccess {
+@@ -932,6 +932,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.5.2.msysgit.0
+1.8.3.2