diff options
Diffstat (limited to 'patch-remap/mache-spigotflower-stripped/net/minecraft/world/entity/projectile/EvokerFangs.java.patch')
-rw-r--r-- | patch-remap/mache-spigotflower-stripped/net/minecraft/world/entity/projectile/EvokerFangs.java.patch | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/patch-remap/mache-spigotflower-stripped/net/minecraft/world/entity/projectile/EvokerFangs.java.patch b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/entity/projectile/EvokerFangs.java.patch new file mode 100644 index 0000000000..e5712ae16e --- /dev/null +++ b/patch-remap/mache-spigotflower-stripped/net/minecraft/world/entity/projectile/EvokerFangs.java.patch @@ -0,0 +1,17 @@ +--- a/net/minecraft/world/entity/projectile/EvokerFangs.java ++++ b/net/minecraft/world/entity/projectile/EvokerFangs.java +@@ -132,9 +127,11 @@ + private void dealDamageTo(LivingEntity livingentity) { + LivingEntity livingentity1 = this.getOwner(); + +- if (livingentity.isAlive() && !livingentity.isInvulnerable() && livingentity != livingentity1) { +- if (livingentity1 == null) { +- livingentity.hurt(this.damageSources().magic(), 6.0F); ++ if (target.isAlive() && !target.isInvulnerable() && target != entityliving1) { ++ if (entityliving1 == null) { ++ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = this; // CraftBukkit ++ target.hurt(this.damageSources().magic(), 6.0F); ++ org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit + } else { + if (livingentity1.isAlliedTo((Entity) livingentity)) { + return; |