Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0100-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From 9fa021fc53595329dbb06c9bf2430846146bfbad Mon Sep 17 00:00:00 2001
+From 963fdf81cdc62893dbcd4246e28a9fdf73b3df17 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 31 Jan 2014 11:18:34 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -7,10 +7,10 @@ Limit a single entity to colliding a max of configurable times per tick.
 This will alleviate issues where living entities are hoarded in 1x1 pens.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0ec07c2..c049cd8 100644
+index c4bdccf..c542460 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1021,6 +1021,7 @@ public abstract class Entity {
+@@ -1023,6 +1023,7 @@ public abstract class Entity {
  
      public void b_(EntityHuman entityhuman) {}
  
@@ -62,5 +62,5 @@ index 1290829..b12a086 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1