From fb5029796f4cd63102e304b4ea107cd4488454ee Mon Sep 17 00:00:00 2001
From: Kam <KamronGaming@gmail.com>
Date: Tue, 17 Feb 2026 17:32:54 -0500
Subject: [PATCH] Update AbilityEnergyProjectile.java

---
 .../ability/type/energy/AbilityEnergyProjectile.java     | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java
index 34a9b42df..dafc38ee8 100644
--- a/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java
+++ b/src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java
@@ -2,6 +2,7 @@ package kamkeel.npcs.controllers.data.ability.type.energy;
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import kamkeel.npcs.controllers.data.ability.Ability;
 import kamkeel.npcs.controllers.data.ability.AnchorPoint;
 import kamkeel.npcs.controllers.data.ability.TargetingMode;
 import kamkeel.npcs.controllers.data.ability.data.*;
@@ -28,13 +29,7 @@ import java.util.List;
  *
  * @param <E> The entity type this ability spawns
  */
-<<<<<<<< HEAD:src/main/java/kamkeel/npcs/controllers/data/ability/type/AbilityEnergyProjectile.java
-public abstract class AbilityEnergyProjectile<E extends EntityAbilityProjectile>
-    extends Ability implements IAbilityEnergyProjectile {
-========
-public abstract class AbilityEnergyProjectile<E extends EntityEnergyProjectile>
-    extends AbilityEnergy implements IAbilityEnergyProjectile {
->>>>>>>> barriers:src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java
+public abstract class AbilityEnergyProjectile<E extends EntityEnergyProjectile> extends AbilityEnergy implements IAbilityEnergyProjectile {
 
     protected static final int MAX_PROJECTILES = 8;