upstream/CustomNPC-Plus
2
0 Fork 0
mirror of https://github.com/KAMKEEL/CustomNPC-Plus.git synced 2026-11-12 04:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update AbilityEnergyProjectile.java

Browse Source
This commit is contained in:
Kam committed 2026-02-17 17:32:54 -05:00
1 parent dcd9572024
commit fb5029796f
1 file changed
+2 -7
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/kamkeel/npcs/controllers/data/ability/type/energy/AbilityEnergyProjectile.java
+2 -7
View File
@@ -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;