Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0059-Arrow-Despawn-Rate.patch

@@ -1,14 +1,14 @@
-From 4f5bd8af4b80ff6e6ec6cc5b639762cac9eaf1b2 Mon Sep 17 00:00:00 2001
+From 0f546eff1ddbd59635860defa0669ee356214fd7 Mon Sep 17 00:00:00 2001
 From: md_5 <md_5@live.com.au>
 Date: Mon, 14 Oct 2013 19:20:10 +1100
 Subject: [PATCH] Arrow Despawn Rate
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 3fd3de9..a49519b 100644
+index 367bcc9..7c9780a 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
-@@ -141,7 +141,7 @@ public class EntityArrow extends Entity implements IProjectile {
+@@ -144,7 +144,7 @@ public class EntityArrow extends Entity implements IProjectile {
  
              if (block == this.g && i == this.h) {
                  ++this.j;
@@ -34,5 +34,5 @@ index 72aabff..d4e8bf4 100644
 +    }
  }
 -- 
-1.8.3.2
+1.8.4.msysgit.0