Cynthia Yantis / CraftBukkit / cdf7988007f

Commits

coll1234567 authored and md_5 committed cdf7988007f 08 Nov 2023

#1290: Add methods to get/set evoker fang attack delay

Modified

-1
+--- a/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
-2
++++ b/net/minecraft/world/entity/projectile/EntityEvokerFangs.java
-+
+@@ -19,7 +19,7 @@
-+
+     public static final int ATTACK_DURATION = 20;
-+
+     public static final int LIFE_OFFSET = 2;
-+
+     public static final int ATTACK_TRIGGER_TICKS = 14;
-+
+-    private int warmupDelayTicks;
-+
++    public int warmupDelayTicks;
-+
+     private boolean sentSpikeEvent;
-+
+     private int lifeTicks;
-+
+     private boolean clientSideAttackStarted;
-12
+@@ -129,7 +129,9 @@
-13
-14
+         if (entityliving.isAlive() && !entityliving.isInvulnerable() && entityliving != entityliving1) {
-15
+             if (entityliving1 == null) {
-16
++                org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = this; // CraftBukkit
-17
+                 entityliving.hurt(this.damageSources().magic(), 6.0F);
-18
++                org.bukkit.craftbukkit.event.CraftEventFactory.entityDamage = null; // CraftBukkit
-19
+             } else {
-20
+                 if (entityliving1.isAlliedTo((Entity) entityliving)) {
-21
+                     return;