Upstream merge

By: Thinkofdeath <thethinkofdeath@gmail.com>

CraftBukkit-Patches/0069-Allow-Disabling-Zombie-Villager-Aggression.patch

@@ -1,4 +1,4 @@
-From ae732d661226c243c0f0c6562f87787def4d3a39 Mon Sep 17 00:00:00 2001
+From 3952f7c334513ce3a02d4d230327bd165dfdab49 Mon Sep 17 00:00:00 2001
 From: Dylan Xaldin <Puremin0rez515@gmail.com>
 Date: Thu, 12 Dec 2013 18:05:03 -0600
 Subject: [PATCH] Allow Disabling Zombie Villager Aggression
@@ -6,10 +6,10 @@ Subject: [PATCH] Allow Disabling Zombie Villager Aggression
 Ability to configure if Zombies will be aggressive towards Villagers.
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index a0b6f62..9098bfb 100644
+index ecb4abe..1eaac63 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -28,7 +28,7 @@ public class EntityZombie extends EntityMonster {
+@@ -30,7 +30,7 @@ public class EntityZombie extends EntityMonster {
          this.getNavigation().b(true);
          this.goalSelector.a(0, new PathfinderGoalFloat(this));
          this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, EntityHuman.class, 1.0D, false));
@@ -18,7 +18,7 @@ index a0b6f62..9098bfb 100644
          this.goalSelector.a(5, new PathfinderGoalMoveTowardsRestriction(this, 1.0D));
          this.goalSelector.a(6, new PathfinderGoalMoveThroughVillage(this, 1.0D, false));
          this.goalSelector.a(7, new PathfinderGoalRandomStroll(this, 1.0D));
-@@ -36,7 +36,7 @@ public class EntityZombie extends EntityMonster {
+@@ -38,7 +38,7 @@ public class EntityZombie extends EntityMonster {
          this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
          this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this, true));
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget(this, EntityHuman.class, 0, true));
@@ -44,5 +44,5 @@ index 2c0501d..042280d 100644
 +    }
  }
 -- 
-1.8.3.2
+1.9.1