mirror of
https://github.com/KAMKEEL/CustomNPC-Plus.git
synced 2026-11-12 08:27:45 +00:00
getTick on EnergyProjectileTick
This commit is contained in:
1 parent
f905e39af2
commit
75b4bdfed8
4 files changed
+11
-5
No files matched your search
+1
-1
Submodule src/api updated: abb700d1cc...f91e17ab3e.
@@ -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();
|
||||
|
||||
@@ -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());
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user