Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-23 02:55:47 +01:00
Code Issues Projects Releases Wiki Activity

SPIGOT-4205: Cancelled damage should not anger pig zombie

Browse Source
This commit is contained in:
md_5 2018-08-01 19:29:24 +10:00
parent a0c7bcf02a
commit 8e87d03145
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
nms-patches/EntityPigZombie.patch Normal file
View File

@ -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
}
}