diff --git a/patches/server/0046-Fix-pig-zombies-MC-56653.patch b/patches/server/0046-Fix-pig-zombies-MC-56653.patch index 6eb6c5ce4..5436fe000 100644 --- a/patches/server/0046-Fix-pig-zombies-MC-56653.patch +++ b/patches/server/0046-Fix-pig-zombies-MC-56653.patch @@ -1,49 +1,40 @@ -From 0ccc51ea89b02d1c95de6f2148e4d475ab732900 Mon Sep 17 00:00:00 2001 +From 55b5b166eb427746bdaa0049808519bbf3cc26e9 Mon Sep 17 00:00:00 2001 From: William Blake Galbreath Date: Tue, 9 Jul 2019 20:56:47 -0500 Subject: [PATCH] Fix pig zombies (MC-56653) --- - .../net/minecraft/server/EntityPigZombie.java | 18 +++++++++++++++--- - 1 file changed, 15 insertions(+), 3 deletions(-) + src/main/java/net/minecraft/server/EntityPigZombie.java | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/minecraft/server/EntityPigZombie.java b/src/main/java/net/minecraft/server/EntityPigZombie.java -index 786592da1..23be3f345 100644 +index 786592da1..3bc6f31d9 100644 --- a/src/main/java/net/minecraft/server/EntityPigZombie.java +++ b/src/main/java/net/minecraft/server/EntityPigZombie.java -@@ -139,6 +139,10 @@ public class EntityPigZombie extends EntityZombie { +@@ -139,6 +139,7 @@ public class EntityPigZombie extends EntityZombie { boolean result = super.damageEntity(damagesource, f); if (result && entity instanceof EntityHuman && !((EntityHuman) entity).isCreative() && this.hasLineOfSight(entity)) { -+ // Purpur start - fix MC-56653 -+ this.setLastDamager((EntityHuman) entity); -+ this.setGoalTarget((EntityHuman) entity, org.bukkit.event.entity.EntityTargetEvent.TargetReason.TARGET_ATTACKED_ENTITY, true); -+ //Purpur end ++ this.setLastDamager((EntityHuman) entity); // Purpur - fix MC-56653 this.a(entity); } -@@ -157,9 +161,11 @@ public class EntityPigZombie extends EntityZombie { - this.angerLevel = event.getNewAnger(); +@@ -158,7 +159,7 @@ public class EntityPigZombie extends EntityZombie { // CraftBukkit end this.soundDelay = this.random.nextInt(40); -- if (entity instanceof EntityLiving) { + if (entity instanceof EntityLiving) { - this.setLastDamager((EntityLiving) entity); -- } -+ // Purpur - fix MC-56653 -+ //if (entity instanceof EntityLiving) { -+ // this.setLastDamager((EntityLiving) entity); -+ //} -+ // Purpur end ++ //this.setLastDamager((EntityLiving) entity); // Purpur - move up to damageEntity - fix MC-56653 + } return true; - } -@@ -207,6 +213,12 @@ public class EntityPigZombie extends EntityZombie { +@@ -207,6 +208,12 @@ public class EntityPigZombie extends EntityZombie { return this.eg(); } -+ // Purpur start - fix MC-56653 ++ // Purpur start - only drop exp/items if damaged by player - fix MC-56653 + protected boolean isDropExperience() { -+ return !this.isBaby() && getLastDamager() != null; ++ return super.isDropExperience() && getLastDamager() instanceof EntityHuman; + } + // Purpur end +