Fix entities targetting while being ridden

patches/server/0011-Make-giants-naturally-spawn-and-have-AI.patch

@@ -1,16 +1,16 @@
-From 6538d3e373f0bc9b0e65ac3c1a60047dab92a874 Mon Sep 17 00:00:00 2001
+From 14e75a22b2727e6dee6075860a42f6855535490d Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 12 May 2019 00:43:12 -0500
 Subject: [PATCH] Make giants naturally spawn and have AI
 
 ---
  .../java/net/minecraft/server/BiomeBase.java  |  1 +
- .../java/net/minecraft/server/Biomes.java     | 25 ++++++++++
- .../minecraft/server/EntityGiantZombie.java   | 48 ++++++++++++++++++-
+ .../java/net/minecraft/server/Biomes.java     | 25 ++++++++++++
+ .../minecraft/server/EntityGiantZombie.java   | 39 +++++++++++++++++--
  .../minecraft/server/EntityInsentient.java    |  2 +
  .../net/minecraft/server/SpawnerCreature.java |  8 ++++
- .../java/net/pl3x/purpur/PurpurConfig.java    |  7 +++
- 6 files changed, 89 insertions(+), 2 deletions(-)
+ .../java/net/pl3x/purpur/PurpurConfig.java    |  7 ++++
+ 6 files changed, 78 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
 index 0102a170d..963709846 100644
@@ -60,10 +60,10 @@ index 12742870c..d1f8695fe 100644
 +    // Purpur end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityGiantZombie.java b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-index b7e2022b1..c2408e721 100644
+index 12a96750c..4aaf4ea6c 100644
 --- a/src/main/java/net/minecraft/server/EntityGiantZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityGiantZombie.java
-@@ -21,11 +21,55 @@ public class EntityGiantZombie extends EntityMonster {
+@@ -21,14 +21,27 @@ public class EntityGiantZombie extends EntityMonster {
          super.initAttributes();
          this.getAttributeInstance(GenericAttributes.MAX_HEALTH).setValue(100.0D);
          this.getAttributeInstance(GenericAttributes.MOVEMENT_SPEED).setValue(0.5D);
@@ -71,30 +71,33 @@ index b7e2022b1..c2408e721 100644
 +        this.getAttributeInstance(GenericAttributes.ATTACK_DAMAGE).setValue(12.0D); // Purpur - match ravager damage
      }
  
-+    // Purpur start
-+    @Override
-+    protected void initPathfinder() {
+     // Purpur start
+     @Override
+     protected void initPathfinder() {
+-        this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
+-        this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 +        if (net.pl3x.purpur.PurpurConfig.giantsHaveAI) {
 +            this.goalSelector.a(0, new PathfinderGoalFloat(this));
++            this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 +            this.goalSelector.a(2, new PathfinderGoalMeleeAttack(this, 1.0D, false));
 +            this.goalSelector.a(7, new PathfinderGoalRandomStrollLand(this, 1.0D));
 +            this.goalSelector.a(8, new PathfinderGoalLookAtPlayer(this, EntityHuman.class, 16.0F));
 +            this.goalSelector.a(8, new PathfinderGoalRandomLookaround(this));
 +            this.goalSelector.a(5, new PathfinderGoalMoveTowardsRestriction(this, 1.0D));
++            this.targetSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 +            this.targetSelector.a(1, new PathfinderGoalHurtByTarget(this).a(EntityPigZombie.class));
 +            this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
 +            this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillager.class, false));
 +            this.targetSelector.a(4, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
 +            this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, true));
 +        }
-+    }
-+
-+    @Override
-+    public float dp() { // jump height
-+        // make giants jump as high as everything else relative to their size
-+        // 1.0 makes bottom of feet about as high as their waist when they jump
-+        return 1.0F;
-+    }
+     }
+ 
+     @Override
+@@ -37,10 +50,28 @@ public class EntityGiantZombie extends EntityMonster {
+         // 1.0 makes bottom of feet about as high as their waist when they jump
+         return 1.0F;
+     }
 +
 +    @Override
 +    public GroupDataEntity prepare(GeneratorAccess world, DifficultyDamageScaler difficulty, EnumMobSpawn enummobspawn, GroupDataEntity groupDataEntity, NBTTagCompound nbt) {
@@ -113,8 +116,8 @@ index b7e2022b1..c2408e721 100644
 +            setSlot(EnumItemSlot.MAINHAND, new ItemStack(Items.IRON_SWORD));
 +        }
 +    }
-+    // Purpur end
-+
+     // Purpur end
+ 
      @Override
      public float a(BlockPosition blockposition, IWorldReader iworldreader) {
 -        return iworldreader.w(blockposition) - 0.5F;

patches/server/0035-Fix-pig-zombies-MC-56653.patch

@@ -1,4 +1,4 @@
-From 251d5327835fdede67ecee55e56f02395deabe36 Mon Sep 17 00:00:00 2001
+From 25737109224f0f03d2b5b05312c0a31b3952c424 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 9 Jul 2019 20:56:47 -0500
 Subject: [PATCH] Fix pig zombies (MC-56653)
@@ -9,10 +9,10 @@ Subject: [PATCH] Fix pig zombies (MC-56653)
  2 files changed, 13 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java
-index 8d57c5f1b5..0a0ecaf197 100644
+index 3321e2257..9938e8a5f 100644
 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
-@@ -139,6 +139,7 @@ public class EntityPigZombie extends EntityZombie {
+@@ -140,6 +140,7 @@ public class EntityPigZombie extends EntityZombie {
              boolean result = super.damageEntity(damagesource, f);
  
              if (result && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity)) {
@@ -20,7 +20,7 @@ index 8d57c5f1b5..0a0ecaf197 100644
                  this.i((EntityLiving) entity);
              }
  
-@@ -157,7 +158,7 @@ public class EntityPigZombie extends EntityZombie {
+@@ -158,7 +159,7 @@ public class EntityPigZombie extends EntityZombie {
          this.angerLevel = event.getNewAnger();
          // CraftBukkit end
          this.soundDelay = this.random.nextInt(40);
@@ -29,7 +29,7 @@ index 8d57c5f1b5..0a0ecaf197 100644
          return true;
      }
  
-@@ -204,6 +205,12 @@ public class EntityPigZombie extends EntityZombie {
+@@ -205,6 +206,12 @@ public class EntityPigZombie extends EntityZombie {
          return this.eA();
      }
  
@@ -43,7 +43,7 @@ index 8d57c5f1b5..0a0ecaf197 100644
  
          public PathfinderGoalAnger(EntityPigZombie entitypigzombie) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 64128359c1..f8755060f1 100644
+index 64128359c..f8755060f 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -116,6 +116,11 @@ public class PurpurWorldConfig {

patches/server/0040-Ladders-should-not-bypass-cramming-gamerule.patch

@@ -1,4 +1,4 @@
-From b83d33f69a3f2665db1515cac7a598bf539499cb Mon Sep 17 00:00:00 2001
+From 62f9b4c2a2a6b774754aaa30a8949001b3a57586 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sun, 21 Jul 2019 18:06:20 -0500
 Subject: [PATCH] Ladders should not bypass cramming gamerule
@@ -17,7 +17,7 @@ Subject: [PATCH] Ladders should not bypass cramming gamerule
  10 files changed, 26 insertions(+), 10 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5a5531c10..416eb5d77 100644
+index 2aa79391a..3be37a100 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1509,6 +1509,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -58,7 +58,7 @@ index b19028fa8..56bdaf0e0 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityBoat.java b/src/main/java/net/minecraft/server/EntityBoat.java
-index 399fdf2f0..cb1156901 100644
+index fdf306e80..563fc8ced 100644
 --- a/src/main/java/net/minecraft/server/EntityBoat.java
 +++ b/src/main/java/net/minecraft/server/EntityBoat.java
 @@ -98,7 +98,7 @@ public class EntityBoat extends Entity {
@@ -71,10 +71,10 @@ index 399fdf2f0..cb1156901 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index 5cd46c747..c02d2afbe 100644
+index dcfbc2313..ba5805de5 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-@@ -165,7 +165,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
+@@ -173,7 +173,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
      }
  
      @Override
@@ -110,7 +110,7 @@ index 38948133e..31cfac0c8 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 5abd8a181..2aa8eb407 100644
+index 1b982a510..7ff7844d0 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -106,7 +106,7 @@ public abstract class EntityMinecartAbstract extends Entity {

patches/server/0042-Implement-configurable-search-radius-for-villagers-t.patch

@@ -1,4 +1,4 @@
-From b7be946d6da6ef9731a126cb8d881540d3b729d7 Mon Sep 17 00:00:00 2001
+From 52098952462100f7b41d327425281338603608e1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 22 Jul 2019 17:32:17 -0500
 Subject: [PATCH] Implement configurable search radius for villagers to spawn
@@ -10,7 +10,7 @@ Subject: [PATCH] Implement configurable search radius for villagers to spawn
  2 files changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 5727230058..daa9544453 100644
+index 7e7818903..d7f7a0b48 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -12,18 +12,14 @@ import java.util.List;
@@ -32,7 +32,7 @@ index 5727230058..daa9544453 100644
  import org.bukkit.event.entity.VillagerReplenishTradeEvent;
  // CraftBukkit end
  
-@@ -874,6 +870,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -881,6 +877,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
  
      @Nullable
      private EntityIronGolem fb() {
@@ -41,7 +41,7 @@ index 5727230058..daa9544453 100644
          int i = 0;
  
 diff --git a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
-index 66dd66f062..6cc6d8015f 100644
+index 66dd66f06..6cc6d8015 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurWorldConfig.java
 @@ -136,6 +136,13 @@ public class PurpurWorldConfig {

patches/server/0044-Implement-configurable-villager-brain-ticks.patch

@@ -1,4 +1,4 @@
-From d744f9a25cb9abcacac69541ced6cc0bf4acf046 Mon Sep 17 00:00:00 2001
+From d499ebe19055966a7138a8070538698b7b31397e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Tue, 23 Jul 2019 08:28:21 -0500
 Subject: [PATCH] Implement configurable villager brain ticks
@@ -9,7 +9,7 @@ Subject: [PATCH] Implement configurable villager brain ticks
  2 files changed, 13 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index daa9544453..7d146d9783 100644
+index d7f7a0b48..a0137c7af 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -49,6 +49,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -27,8 +27,8 @@ index daa9544453..7d146d9783 100644
 +        brainTickOffset = getRandom().nextInt(100); // Purpur
      }
  
-     @Override
-@@ -141,6 +143,10 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+     // Purpur start
+@@ -148,6 +150,10 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
      @Override
      protected void mobTick() {
          this.world.getMethodProfiler().enter("brain");
@@ -40,7 +40,7 @@ index daa9544453..7d146d9783 100644
          this.world.getMethodProfiler().exit();
          if (!this.et() && this.bB > 0) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index de0cf5c55e..c35d19f66f 100644
+index de0cf5c55..c35d19f66 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -209,6 +209,13 @@ public class PurpurConfig {

patches/server/0060-Allow-leashing-villagers.patch

@@ -1,4 +1,4 @@
-From 5951f8637bdb457ae59201563ce04832cb1595ae Mon Sep 17 00:00:00 2001
+From 35e3756e3ce2321954c38217ec665122095ce4cf Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Thu, 3 Oct 2019 18:08:03 -0500
 Subject: [PATCH] Allow leashing villagers
@@ -22,10 +22,10 @@ index 97081f6a4..491db81ba 100644
              if (CraftEventFactory.callPlayerUnleashEntityEvent(this, entityhuman).isCancelled()) {
                  ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutAttachEntity(this, this.getLeashHolder()));
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 10625b3ab..cd8da30a1 100644
+index a0137c7af..a53decb2c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -980,4 +980,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -987,4 +987,11 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
  
          return optional.isPresent() && optional1.isPresent() ? i - ((MinecraftSerializableLong) optional.get()).a() < 24000L && i - ((MinecraftSerializableLong) optional1.get()).a() < 36000L : false;
      }

patches/server/0065-Add-more-llama-API.patch

@@ -1,4 +1,4 @@
-From 0eb1d9482de3f315ebead0cac4ae90b1b152ca03 Mon Sep 17 00:00:00 2001
+From cb0af57ced6d7902fc27ec8c692f4918d5448c73 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 18 Oct 2019 22:50:12 -0500
 Subject: [PATCH] Add more llama API
@@ -11,7 +11,7 @@ Subject: [PATCH] Add more llama API
  4 files changed, 63 insertions(+), 8 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index ec0f57d90..c9d8a4e13 100644
+index 8d14c1817..03424ccf2 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -12,7 +12,8 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -46,7 +46,7 @@ index ec0f57d90..c9d8a4e13 100644
          this.eI();
      }
  
-@@ -403,19 +408,24 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -411,19 +416,24 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          }
      }
  
@@ -71,7 +71,7 @@ index ec0f57d90..c9d8a4e13 100644
      public boolean fc() {
          return this.bK != null;
      }
-@@ -425,8 +435,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
+@@ -433,8 +443,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
          return this.bJ != null;
      }
  

patches/server/0068-Add-more-evoker-API.patch

@@ -1,4 +1,4 @@
-From 5b5b757044b8fe16128b67d4e858c3aa510d36d1 Mon Sep 17 00:00:00 2001
+From 47c58f252b1b581c205adf393344b7af163e8eb1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 00:29:02 -0500
 Subject: [PATCH] Add more evoker API
@@ -9,10 +9,10 @@ Subject: [PATCH] Add more evoker API
  2 files changed, 17 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 3560c95298..ed0111a722 100644
+index e60a42829..e3c80ad3f 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
-@@ -85,12 +85,14 @@ public class EntityEvoker extends EntityIllagerWizard {
+@@ -86,12 +86,14 @@ public class EntityEvoker extends EntityIllagerWizard {
          return SoundEffects.ENTITY_EVOKER_HURT;
      }
  
@@ -30,7 +30,7 @@ index 3560c95298..ed0111a722 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
-index 0636d26473..4ccb938909 100644
+index 0636d2647..4ccb93890 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEvoker.java
 @@ -36,4 +36,17 @@ public class CraftEvoker extends CraftSpellcaster implements Evoker {
@@ -52,5 +52,5 @@ index 0636d26473..4ccb938909 100644
 +    // Purpur end
  }
 -- 
-2.24.0.rc1
+2.24.0
 

patches/server/0072-Add-option-to-allow-iron-golems-to-spawn-in-air.patch

@@ -1,4 +1,4 @@
-From bd25f55b2b0d9689844b8cc6f6b33718ed8dfefb Mon Sep 17 00:00:00 2001
+From 55c0eb9e453436d84fa0507abd25410a0280f1d1 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Sat, 19 Oct 2019 02:20:45 -0500
 Subject: [PATCH] Add option to allow iron golems to spawn in air
@@ -9,10 +9,10 @@ Subject: [PATCH] Add option to allow iron golems to spawn in air
  2 files changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityIronGolem.java b/src/main/java/net/minecraft/server/EntityIronGolem.java
-index dbdc200ec3..314cb7fcfe 100644
+index 3054e0435..ffdd19c66 100644
 --- a/src/main/java/net/minecraft/server/EntityIronGolem.java
 +++ b/src/main/java/net/minecraft/server/EntityIronGolem.java
-@@ -224,7 +224,7 @@ public class EntityIronGolem extends EntityGolem {
+@@ -225,7 +225,7 @@ public class EntityIronGolem extends EntityGolem {
          BlockPosition blockposition1 = blockposition.down();
          IBlockData iblockdata = iworldreader.getType(blockposition1);
  
@@ -22,7 +22,7 @@ index dbdc200ec3..314cb7fcfe 100644
          } else {
              for (int i = 1; i < 3; ++i) {
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
-index 7e06cd044e..148fc22ff7 100644
+index 7e06cd044..148fc22ff 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java
 +++ b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 @@ -221,8 +221,10 @@ public class PurpurConfig {

patches/server/0080-Phantoms-only-attack-insomniacs.patch

@@ -1,4 +1,4 @@
-From c01cdfacaaa03c66a34485f1722291bcc07be971 Mon Sep 17 00:00:00 2001
+From b71b29f039e7ac4253de1ee80f21fafa3eeab00f Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 20:33:41 -0600
 Subject: [PATCH] Phantoms only attack insomniacs
@@ -10,10 +10,10 @@ Subject: [PATCH] Phantoms only attack insomniacs
  3 files changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityPhantom.java b/src/main/java/net/minecraft/server/EntityPhantom.java
-index 5cfa69b32..a98453665 100644
+index 18bdc6717..2c1124a66 100644
 --- a/src/main/java/net/minecraft/server/EntityPhantom.java
 +++ b/src/main/java/net/minecraft/server/EntityPhantom.java
-@@ -392,8 +392,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
+@@ -393,8 +393,11 @@ public class EntityPhantom extends EntityFlying implements IMonster {
                          EntityHuman entityhuman = (EntityHuman) iterator.next();
  
                          if (EntityPhantom.this.a((EntityLiving) entityhuman, PathfinderTargetCondition.a)) {

patches/server/0081-Villagers-follow-emerald-blocks.patch

@@ -1,15 +1,15 @@
-From 48a7b50eaee27e05f1684414d1d21302d5fafa4c Mon Sep 17 00:00:00 2001
+From 37e66685cf13319e5f40f54c06b1ea4a6eea868e Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:10:12 -0600
 Subject: [PATCH] Villagers follow emerald blocks
 
 ---
- src/main/java/net/minecraft/server/EntityVillager.java | 10 ++++++++++
- src/main/java/net/pl3x/purpur/PurpurConfig.java        |  2 ++
- 2 files changed, 12 insertions(+)
+ src/main/java/net/minecraft/server/EntityVillager.java | 4 ++++
+ src/main/java/net/pl3x/purpur/PurpurConfig.java        | 2 ++
+ 2 files changed, 6 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index cd8da30a1..9415abeab 100644
+index a53decb2c..c3d805d07 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -25,6 +25,7 @@ import org.bukkit.event.entity.VillagerReplenishTradeEvent;
@@ -20,22 +20,16 @@ index cd8da30a1..9415abeab 100644
      private static final DataWatcherObject<VillagerData> bz = DataWatcher.a(EntityVillager.class, DataWatcherRegistry.q);
      public static final Map<Item, Integer> bx = ImmutableMap.of(Items.BREAD, 4, Items.POTATO, 1, Items.CARROT, 1, Items.BEETROOT, 1);
      private static final Set<Item> bA = ImmutableSet.of(Items.BREAD, Items.POTATO, Items.CARROT, Items.WHEAT, Items.WHEAT_SEEDS, Items.BEETROOT, new Item[]{Items.BEETROOT_SEEDS});
-@@ -66,6 +67,15 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
-         brainTickOffset = getRandom().nextInt(100); // Purpur
-     }
- 
-+    // Purpur start
-+    @Override
-+    protected void initPathfinder() {
+@@ -70,6 +71,9 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+     @Override
+     protected void initPathfinder() {
+         this.goalSelector.a(0, new net.pl3x.purpur.pathfinder.PathfinderGoalHasRider(this)); // Purpur
 +        if (net.pl3x.purpur.PurpurConfig.villagersFollowEmeraldBlocks) {
 +            this.goalSelector.a(3, new PathfinderGoalTempt(this, 1.0D, false, TEMPT_ITEMS));
 +        }
-+    }
-+    // Purpur end
-+
-     @Override
-     public BehaviorController<EntityVillager> getBehaviorController() {
-         return (BehaviorController<EntityVillager>) super.getBehaviorController(); // CraftBukkit - decompile error
+     }
+     // Purpur end
+ 
 diff --git a/src/main/java/net/pl3x/purpur/PurpurConfig.java b/src/main/java/net/pl3x/purpur/PurpurConfig.java
 index 46dc8cf79..81f41ccc7 100644
 --- a/src/main/java/net/pl3x/purpur/PurpurConfig.java

patches/server/0082-Add-charged-creeper-spawn-chance.patch

@@ -1,4 +1,4 @@
-From 0ddcaa13c2b1d7dd3a4f57fec987731661dc1d2e Mon Sep 17 00:00:00 2001
+From ae620aab7f3a4527b34d4a50d1959137f4c5e8a5 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 29 Nov 2019 22:37:44 -0600
 Subject: [PATCH] Add charged creeper spawn chance
@@ -9,7 +9,7 @@ Subject: [PATCH] Add charged creeper spawn chance
  2 files changed, 21 insertions(+)
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index d1acd38f9..cc155fa34 100644
+index af7d03e3a..2269c5dfc 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -1,11 +1,16 @@
@@ -29,7 +29,7 @@ index d1acd38f9..cc155fa34 100644
  // CraftBukkit end
  
  public class EntityCreeper extends EntityMonster {
-@@ -70,6 +75,17 @@ public class EntityCreeper extends EntityMonster {
+@@ -71,6 +76,17 @@ public class EntityCreeper extends EntityMonster {
          this.datawatcher.register(EntityCreeper.d, false);
      }
  

patches/server/0088-Add-option-for-zombie-villager-transformation-chance.patch

@@ -1,4 +1,4 @@
-From 733bfd9678905290d1543d825475c93c71dad3b1 Mon Sep 17 00:00:00 2001
+From b7b30eb7a910ad16f455fd8071952320f82096ae Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 19 Dec 2019 16:59:46 -0600
 Subject: [PATCH] Add option for zombie villager transformation chance
@@ -9,10 +9,10 @@ Subject: [PATCH] Add option for zombie villager transformation chance
  2 files changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 11171b4a1..b6ec0b34b 100644
+index 71124f9f8..78f6c15b9 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
-@@ -457,8 +457,19 @@ public class EntityZombie extends EntityMonster {
+@@ -458,8 +458,19 @@ public class EntityZombie extends EntityMonster {
      @Override
      public void b(EntityLiving entityliving) {
          super.b(entityliving);

patches/server/0099-Fix-MC-167561-All-players-can-make-a-dog-stand-up-or.patch

@@ -1,4 +1,4 @@
-From 75194dba0e395c1afad5dac303ea0a6fe16f4f63 Mon Sep 17 00:00:00 2001
+From 991cdb09e0317cb0fd2b3e2b17e007879e62787a Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 30 Jan 2020 01:21:22 -0600
 Subject: [PATCH] Fix MC-167561 All players can make a dog stand up or sit down
@@ -9,7 +9,7 @@ Subject: [PATCH] Fix MC-167561 All players can make a dog stand up or sit down
  2 files changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/main/java/net/minecraft/server/EntityTameableAnimal.java b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
-index 4ac12ebe2c..3f7dde981d 100644
+index 4ac12ebe2..3f7dde981 100644
 --- a/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 +++ b/src/main/java/net/minecraft/server/EntityTameableAnimal.java
 @@ -141,6 +141,7 @@ public abstract class EntityTameableAnimal extends EntityAnimal {
@@ -21,10 +21,10 @@ index 4ac12ebe2c..3f7dde981d 100644
          return entityliving == this.getOwner();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 738a9e1dbc..92a56527a4 100644
+index 3e2c4c732..b57c3b347 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
-@@ -294,7 +294,7 @@ public class EntityWolf extends EntityTameableAnimal {
+@@ -295,7 +295,7 @@ public class EntityWolf extends EntityTameableAnimal {
                      return true;
                  }