From 75b4bdfed869bfc8534cfb266e013ac8769bcaa9 Mon Sep 17 00:00:00 2001 From: Vidal Date: Tue, 10 Mar 2026 22:01:54 -0300 Subject: [PATCH] getTick on EnergyProjectileTick --- src/api | 2 +- .../java/kamkeel/npcs/entity/EntityEnergyProjectile.java | 2 +- src/main/java/noppes/npcs/EventHooks.java | 4 ++-- .../noppes/npcs/scripted/event/EnergyProjectileEvent.java | 8 +++++++- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/api b/src/api index abb700d1c..f91e17ab3 160000 --- a/src/api +++ b/src/api @@ -1 +1 @@ -Subproject commit abb700d1cc5184ff1348520bfd46e84cac815b71 +Subproject commit f91e17ab3ef4bf168836f8619c60cf6806f6ab84 diff --git a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java index 1527f644d..5764bf0af 100644 --- a/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java +++ b/src/main/java/kamkeel/npcs/entity/EntityEnergyProjectile.java @@ -348,7 +348,7 @@ public abstract class EntityEnergyProjectile extends EntityEnergyAbility { // Fire tick event (server-side, non-preview only) if (!previewMode && !worldObj.isRemote) { - EventHooks.onEnergyProjectileTick(this); + EventHooks.onEnergyProjectileTick(this, ticksExisted); } debugLogTick(); diff --git a/src/main/java/noppes/npcs/EventHooks.java b/src/main/java/noppes/npcs/EventHooks.java index b783f98e0..92475f8b3 100644 --- a/src/main/java/noppes/npcs/EventHooks.java +++ b/src/main/java/noppes/npcs/EventHooks.java @@ -482,9 +482,9 @@ public class EventHooks { NpcAPI.EVENT_BUS.post(event); } - public static void onEnergyProjectileTick(EntityEnergyProjectile projectile) { + public static void onEnergyProjectileTick(EntityEnergyProjectile projectile, int tick) { IEnergyProjectile wrapped = (IEnergyProjectile) NpcAPI.Instance().getIEntity(projectile); - EnergyProjectileEvent.UpdateEvent event = new EnergyProjectileEvent.UpdateEvent(wrapped); + EnergyProjectileEvent.UpdateEvent event = new EnergyProjectileEvent.UpdateEvent(wrapped, tick); ScriptController.Instance.globalNpcScripts.callScript(EnumScriptType.ENERGY_PROJECTILE_TICK, event); Entity owner = projectile.worldObj.getEntityByID(projectile.getOwnerEntityId()); diff --git a/src/main/java/noppes/npcs/scripted/event/EnergyProjectileEvent.java b/src/main/java/noppes/npcs/scripted/event/EnergyProjectileEvent.java index 4a1fab5a2..024376103 100644 --- a/src/main/java/noppes/npcs/scripted/event/EnergyProjectileEvent.java +++ b/src/main/java/noppes/npcs/scripted/event/EnergyProjectileEvent.java @@ -49,10 +49,16 @@ public class EnergyProjectileEvent extends CustomNPCsEvent implements IEnergyPro * energyProjectileTick */ public static class UpdateEvent extends EnergyProjectileEvent implements IEnergyProjectileEvent.UpdateEvent { - public UpdateEvent(IEnergyProjectile projectile) { + private final int tick; + + public UpdateEvent(IEnergyProjectile projectile, int tick) { super(projectile); + this.tick = tick; } + @Override + public int getTick() { return this.tick; } + @Override public String getHookName() { return EnumScriptType.ENERGY_PROJECTILE_TICK.function;