[Cleanup] Update merge patches.

By: md_5 <md_5@live.com.au>

CraftBukkit-Patches/0018-Reduce-number-of-LivingEntity-collision-checks.patch

@@ -0,0 +1,37 @@
+From 44b79ea940e90d3f92db99bed464beb71ad4b8a0 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Fri, 18 Jan 2013 19:31:14 -0500
+Subject: [PATCH] Reduce number of LivingEntity collision checks.
+
+---
+ src/main/java/net/minecraft/server/EntityLiving.java | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
+index 350560e..84a2926 100644
+--- a/src/main/java/net/minecraft/server/EntityLiving.java
++++ b/src/main/java/net/minecraft/server/EntityLiving.java
+@@ -1428,12 +1428,20 @@ public abstract class EntityLiving extends Entity {
+     }
+ 
+     protected void bg() {
++        // Spigot start
++        boolean skip = false;
++        if (!(this instanceof EntityPlayer) && this.ticksLived % 2 != 0) {
++            skip = true;
++        }
++        // Spigot end
++
+         List list = this.world.getEntities(this, this.boundingBox.grow(0.20000000298023224D, 0.0D, 0.20000000298023224D));
+ 
+         if (list != null && !list.isEmpty()) {
+             for (int i = 0; i < list.size(); ++i) {
+                 Entity entity = (Entity) list.get(i);
+ 
++                if (entity instanceof EntityLiving && skip) { continue; } // Spigot
+                 if (entity.L()) {
+                     this.o(entity);
+                 }
+-- 
+1.8.1-rc2
+