patch-remap/mache-spigotflower-stripped/net/minecraft/world/entity/projectile/EvokerFangs.java.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
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;