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

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)

---
 src/main/java/net/minecraft/server/EntityPigZombie.java | 9 ++++++++-
 src/main/java/net/pl3x/purpur/PurpurWorldConfig.java    | 5 +++++
 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 3321e2257..9938e8a5f 100644
--- a/src/main/java/net/minecraft/server/EntityPigZombie.java
+++ b/src/main/java/net/minecraft/server/EntityPigZombie.java
@@ -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)) {
+                if (world.purpurConfig.pigmenDontTargetUnlessHit) this.setLastDamager((EntityHuman) entity); // Purpur - fix MC-56653
                 this.i((EntityLiving) entity);
             }
 
@@ -158,7 +159,7 @@ public class EntityPigZombie extends EntityZombie {
         this.angerLevel = event.getNewAnger();
         // CraftBukkit end
         this.soundDelay = this.random.nextInt(40);
-        this.setLastDamager(entityliving);
+        if (!world.purpurConfig.pigmenDontTargetUnlessHit) this.setLastDamager(entityliving); // Purpur - fix MC-56653
         return true;
     }
 
@@ -205,6 +206,12 @@ public class EntityPigZombie extends EntityZombie {
         return this.eA();
     }
 
+    // Purpur start - fix MC-56653
+    protected boolean isDropExperience() {
+        return super.isDropExperience() && (!world.purpurConfig.pigmenDontTargetUnlessHit || getLastDamager() instanceof EntityHuman);
+    }
+    // Purpur end
+
     static class PathfinderGoalAnger extends PathfinderGoalNearestAttackableTarget<EntityHuman> {
 
         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 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 {
         enderDragonAlwaysDropsEggBlock = getBoolean("mobs.ender-dragon.always-drop-egg-block", enderDragonAlwaysDropsEggBlock);
     }
 
+    public boolean pigmenDontTargetUnlessHit = false;
+    private void pigmenSettings() {
+        pigmenDontTargetUnlessHit = getBoolean("mobs.pigmen.dont-target-unless-hit", pigmenDontTargetUnlessHit);
+    }
+
     public float zombieHorseSpawnChance = 0F;
     private void zombieHorseSettings() {
         zombieHorseSpawnChance = (float) getDouble("mobs.zombie_horse.spawn-chance", zombieHorseSpawnChance);
-- 
2.24.0