BETA: Cleaning up useless effect types.

	Reviewed by: Nos

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Backstab.java

@@ -49,7 +49,7 @@ public final class Backstab extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.FATAL_BLOW;
+		return L2EffectType.PHYSICAL_ATTACK;
 	}
 	
 	@Override
@@ -70,7 +70,7 @@ public final class Backstab extends AbstractEffect
 		L2Character activeChar = info.getEffector();
 		boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS);
 		byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
-		double damage = (int) Formulas.calcBackstabDamage(activeChar, target, info.getSkill(), shld, ss);
+		double damage = Formulas.calcBackstabDamage(activeChar, target, info.getSkill(), shld, ss);
 		
 		// Crit rate base crit rate for skill, modified with STR bonus
 		if (Formulas.calcCrit(info.getSkill().getBaseCritRate() * 10 * BaseStats.STR.calcBonus(activeChar), true, target))

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/BlockResurrection.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 
 /**
  * Block Resurrection effect implementation.
@@ -40,10 +39,4 @@ public final class BlockResurrection extends AbstractEffect
 	{
 		return EffectFlag.BLOCK_RESURRECTION.getMask();
 	}
-	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.BLOCK_RESURRECTION;
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ClanGate.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -38,12 +37,6 @@ public final class ClanGate extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.CLAN_GATE;
-	}
-	
 	@Override
 	public void onStart(BuffInfo info)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpDamPercent.java

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.stats.Formulas;
 
@@ -40,12 +39,6 @@ public final class CpDamPercent extends AbstractEffect
 		_power = params.getDouble("power", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.CPDAMPERCENT;
-	}
-	
 	@Override
 	public boolean isInstant()
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealOverTime.java

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 /**
@@ -38,12 +37,6 @@ public final class CpHealOverTime extends AbstractEffect
 		_power = params.getDouble("power", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.CPHEAL_OVER_TIME;
-	}
-	
 	@Override
 	public boolean onActionTime(BuffInfo info)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CpHealPercent.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -42,12 +41,6 @@ public final class CpHealPercent extends AbstractEffect
 		_power = params.getDouble("power", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.CPHEAL_PERCENT;
-	}
-	
 	@Override
 	public boolean isInstant()
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -63,7 +63,7 @@ public final class EnergyAttack extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.ENERGY_ATTACK;
+		return L2EffectType.PHYSICAL_ATTACK;
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/FatalBlow.java

@@ -49,7 +49,7 @@ public final class FatalBlow extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.FATAL_BLOW;
+		return L2EffectType.PHYSICAL_ATTACK;
 	}
 	
 	@Override
@@ -71,7 +71,7 @@ public final class FatalBlow extends AbstractEffect
 		
 		boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS);
 		byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
-		double damage = (int) Formulas.calcBlowDamage(activeChar, target, info.getSkill(), shld, ss);
+		double damage = Formulas.calcBlowDamage(activeChar, target, info.getSkill(), shld, ss);
 		
 		// Crit rate base crit rate for skill, modified with STR bonus
 		boolean crit = Formulas.calcCrit(info.getSkill().getBaseCritRate() * 10 * BaseStats.STR.calcBonus(activeChar), true, target);

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealOverTime.java

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.AbnormalType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.network.serverpackets.ExRegenMax;
@@ -40,12 +39,6 @@ public final class HealOverTime extends AbstractEffect
 		_power = params.getDouble("power", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.HEAL_OVER_TIME;
-	}
-	
 	@Override
 	public boolean onActionTime(BuffInfo info)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HealPercent.java

@@ -45,7 +45,7 @@ public final class HealPercent extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.HEAL_PERCENT;
+		return L2EffectType.HEAL;
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Invincible.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 
 /**
  * Invincible effect implementation.
@@ -39,10 +38,4 @@ public final class Invincible extends AbstractEffect
 	{
 		return EffectFlag.INVUL.getMask();
 	}
-	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.INVINCIBLE;
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lethal.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.stats.Formulas;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -45,12 +44,6 @@ public final class Lethal extends AbstractEffect
 		_halfLethal = params.getInt("halfLethal", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.LETHAL;
-	}
-	
 	@Override
 	public boolean isInstant()
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Lucky.java

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 /**
@@ -41,12 +40,6 @@ public final class Lucky extends AbstractEffect
 		return (info.getEffector() != null) && (info.getEffected() != null) && info.getEffected().isPlayer();
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.LUCKY;
-	}
-	
 	@Override
 	public boolean onActionTime(BuffInfo info)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackMp.java

@@ -54,7 +54,7 @@ public final class MagicalAttackMp extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.MAGICAL_ATTACK_MP;
+		return L2EffectType.MAGICAL_ATTACK;
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.network.SystemMessageId;
 
@@ -39,12 +38,6 @@ public final class ManaDamOverTime extends AbstractEffect
 		_power = params.getDouble("power", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.MANA_DMG_OVER_TIME;
-	}
-	
 	@Override
 	public boolean onActionTime(BuffInfo info)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ManaHeal.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 import com.l2jserver.gameserver.model.stats.Stats;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -43,12 +42,6 @@ public final class ManaHeal extends AbstractEffect
 		_power = params.getDouble("power", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.MANAHEAL;
-	}
-	
 	@Override
 	public boolean isInstant()
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OutpostCreate.java

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  * Outpost Create effect implementation.
  * @author UnAfraid
  */
-public class OutpostCreate extends AbstractEffect
+public final class OutpostCreate extends AbstractEffect
 {
 	private static final int HQ_NPC_ID = 36590;
 	

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/OutpostDestroy.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  * Outpost Destroy effect implementation.
  * @author UnAfraid
  */
-public class OutpostDestroy extends AbstractEffect
+public final class OutpostDestroy extends AbstractEffect
 {
 	public OutpostDestroy(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 /**
@@ -42,12 +41,6 @@ public final class PhysicalAttackMute extends AbstractEffect
 		return EffectFlag.PSYCHICAL_ATTACK_MUTED.getMask();
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.PHYSICAL_ATTACK_MUTE;
-	}
-	
 	@Override
 	public void onStart(BuffInfo info)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ProtectionBlessing.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.EffectFlag;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 /**
@@ -47,10 +46,4 @@ public final class ProtectionBlessing extends AbstractEffect
 	{
 		return EffectFlag.PROTECTION_BLESSING.getMask();
 	}
-	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.PROTECTION_BLESSING;
-	}
 }

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SoulBlow.java

@@ -51,7 +51,7 @@ public final class SoulBlow extends AbstractEffect
 	@Override
 	public L2EffectType getEffectType()
 	{
-		return L2EffectType.FATAL_BLOW;
+		return L2EffectType.PHYSICAL_ATTACK;
 	}
 	
 	@Override
@@ -73,7 +73,7 @@ public final class SoulBlow extends AbstractEffect
 		
 		boolean ss = info.getSkill().useSoulShot() && activeChar.isChargedShot(ShotType.SOULSHOTS);
 		byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
-		double damage = (int) Formulas.calcBlowDamage(activeChar, target, info.getSkill(), shld, ss);
+		double damage = Formulas.calcBlowDamage(activeChar, target, info.getSkill(), shld, ss);
 		if ((info.getSkill().getMaxSoulConsumeCount() > 0) && activeChar.isPlayer())
 		{
 			// Souls Formula (each soul increase +4%)

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java

@@ -21,7 +21,6 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 /**
@@ -39,12 +38,6 @@ public final class StaticDamage extends AbstractEffect
 		_power = params.getInt("power", 0);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.STATIC_DAMAGE;
-	}
-	
 	@Override
 	public boolean isInstant()
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TransferDamage.java

@@ -22,7 +22,6 @@ import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
-import com.l2jserver.gameserver.model.effects.L2EffectType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
 
 /**
@@ -36,12 +35,6 @@ public final class TransferDamage extends AbstractEffect
 		super(attachCond, applyCond, set, params);
 	}
 	
-	@Override
-	public L2EffectType getEffectType()
-	{
-		return L2EffectType.DAMAGE_TRANSFER;
-	}
-	
 	@Override
 	public void onExit(BuffInfo info)
 	{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java

@@ -37,7 +37,7 @@ import com.l2jserver.util.Rnd;
  * Trigger Skill By Damage effect implementation.
  * @author UnAfraid
  */
-public class TriggerSkillByDamage extends AbstractEffect implements IDamageReceivedEventListener
+public final class TriggerSkillByDamage extends AbstractEffect implements IDamageReceivedEventListener
 {
 	private final int _minAttackerLevel;
 	private final int _maxAttackerLevel;

L2J_DataPack_BETA/dist/game/data/scripts/instances/SeedOfInfinity/HallOfSuffering.java

@@ -682,7 +682,7 @@ public final class HallOfSuffering extends Quest
 	@Override
 	public String onSkillSee(L2Npc npc, L2PcInstance caster, Skill skill, L2Object[] targets, boolean isSummon)
 	{
-		if (skill.hasEffectType(L2EffectType.REBALANCE_HP, L2EffectType.HEAL, L2EffectType.HEAL_PERCENT))
+		if (skill.hasEffectType(L2EffectType.REBALANCE_HP, L2EffectType.HEAL))
 		{
 			int hate = 2 * skill.getEffectPoint();
 			if (hate < 2)