From 8e87d031457095700bf0426e70f216d534ee9c2d Mon Sep 17 00:00:00 2001 From: md_5 Date: Wed, 1 Aug 2018 19:29:24 +1000 Subject: SPIGOT-4205: Cancelled damage should not anger pig zombie --- nms-patches/EntityPigZombie.patch | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 nms-patches/EntityPigZombie.patch (limited to 'nms-patches/EntityPigZombie.patch') diff --git a/nms-patches/EntityPigZombie.patch b/nms-patches/EntityPigZombie.patch new file mode 100644 index 00000000..96303f5c --- /dev/null +++ b/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 + } + } + -- cgit v1.2.3