From 3319c6dd5b0ffdcb1341c88e04c0e661fcc33eee Mon Sep 17 00:00:00 2001
From: CraftBukkit/Spigot <noreply+git-craftbukkit@papermc.io>
Date: Wed, 1 Aug 2018 19:29:24 +1000
Subject: [PATCH] SPIGOT-4205: Cancelled damage should not anger pig zombie

By: md_5 <git@md-5.net>
---
 .../nms-patches/EntityPigZombie.patch         | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 paper-server/nms-patches/EntityPigZombie.patch

diff --git a/paper-server/nms-patches/EntityPigZombie.patch b/paper-server/nms-patches/EntityPigZombie.patch
new file mode 100644
index 000000000..96303f5cd
--- /dev/null
+++ b/paper-server/nms-patches/EntityPigZombie.patch
@@ -0,0 +1,20 @@
+--- a/net/minecraft/server/EntityPigZombie.java
++++ b/net/minecraft/server/EntityPigZombie.java
+@@ -113,11 +113,15 @@
+         } else {
+             Entity entity = damagesource.getEntity();
+ 
+-            if (entity instanceof EntityHuman && !((EntityHuman) entity).u()) {
++            // CraftBukkit start
++            boolean result = super.damageEntity(damagesource, f);
++
++            if (result && entity instanceof EntityHuman && !((EntityHuman) entity).u()) {
+                 this.a(entity);
+             }
+ 
+-            return super.damageEntity(damagesource, f);
++            return result;
++            // CraftBukkit end
+         }
+     }
+