diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeamDual.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeamDual.java index bc09d4979..f7046d322 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeamDual.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityBeamDual.java @@ -95,7 +95,7 @@ public class AbilityBeamDual extends Ability { if (beamEntity2 != null && !beamEntity2.isDead && dualFireDelay <= 0) { beamEntity2.startFiring(target); } - } else { + } else if (beamEntity2 != null) { beamEntity2.setDead(); } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDiscDual.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDiscDual.java index a4e2cda4a..98e924b8a 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDiscDual.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityDiscDual.java @@ -103,7 +103,7 @@ public class AbilityDiscDual extends Ability { if (discEntity2 != null && !discEntity2.isDead && dualFireDelay <= 0) { discEntity2.startMoving(target); } - } else { + } else if (discEntity2 != null) { discEntity2.setDead(); } diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java index 13733cf5c..3fb4335be 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityLaserShot.java @@ -107,6 +107,12 @@ public class AbilityLaserShot extends Ability implements IAbilityLaserShot { public void onExecute(EntityLivingBase caster, EntityLivingBase target, World world) { if (world.isRemote) { signalCompletion(); + return; + } + + if (laserEntity == null) { + signalCompletion(); + return; } laserEntity.startMoving(target); diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrbDual.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrbDual.java index 1d92f8f0c..390610a2e 100644 --- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrbDual.java +++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityOrbDual.java @@ -94,7 +94,7 @@ public class AbilityOrbDual extends Ability { if (orbEntity2 != null && !orbEntity2.isDead && dualFireDelay <= 0) { orbEntity2.startMoving(target); } - } else { + } else if (orbEntity2 != null) { orbEntity2.setDead(); }