From 1a6fbe586447490def585c36dfa8e39d21ce31f3 Mon Sep 17 00:00:00 2001
From: Zoey76 <zoey_76@msn.com>
Date: Tue, 4 Oct 2011 01:18:17 +0000
Subject: [PATCH] BETA: Moving target types out of L2Skill Datapack part.
* Renamed some method to match it's function. * Better Format setting for
enums. '''Note:''' Require [4975].
---
.../.settings/org.eclipse.jdt.core.prefs | 4 +-
.../data/scripts/handlers/MasterHandler.java | 68 +++++++++----------
.../effecthandlers/EffectSignetMDam.java | 4 +-
.../handlers/skillhandlers/Disablers.java | 3 +-
.../handlers/skillhandlers/Resurrect.java | 18 +----
.../handlers/targethandlers/TargetAlly.java | 10 +--
.../handlers/targethandlers/TargetArea.java | 10 +--
.../targethandlers/TargetAreaCorpseMob.java | 10 +--
.../targethandlers/TargetAreaSummon.java | 10 +--
.../targethandlers/TargetAreaUndead.java | 10 +--
.../handlers/targethandlers/TargetAura.java | 10 +--
.../targethandlers/TargetAuraCorpseMob.java | 10 +--
.../targethandlers/TargetBehindArea.java | 10 +--
.../targethandlers/TargetBehindAura.java | 10 +--
.../handlers/targethandlers/TargetClan.java | 10 +--
.../targethandlers/TargetClanMember.java | 10 +--
.../targethandlers/TargetCorpseAlly.java | 10 +--
.../targethandlers/TargetCorpseClan.java | 10 +--
.../targethandlers/TargetCorpseMob.java | 10 +--
.../targethandlers/TargetCorpsePet.java | 10 +--
.../targethandlers/TargetCorpsePlayer.java | 10 +--
.../targethandlers/TargetEnemySummon.java | 10 +--
.../targethandlers/TargetFlagPole.java | 10 +--
.../targethandlers/TargetFrontArea.java | 10 +--
.../targethandlers/TargetFrontAura.java | 10 +--
.../handlers/targethandlers/TargetGround.java | 10 +--
.../handlers/targethandlers/TargetHoly.java | 10 +--
.../handlers/targethandlers/TargetOne.java | 10 +--
.../targethandlers/TargetOwnerPet.java | 10 +--
.../handlers/targethandlers/TargetParty.java | 10 +--
.../targethandlers/TargetPartyClan.java | 10 +--
.../targethandlers/TargetPartyMember.java | 10 +--
.../targethandlers/TargetPartyNotMe.java | 10 +--
.../targethandlers/TargetPartyOther.java | 10 +--
.../handlers/targethandlers/TargetPet.java | 10 +--
.../handlers/targethandlers/TargetSelf.java | 10 +--
.../handlers/targethandlers/TargetSummon.java | 10 +--
.../handlers/targethandlers/TargetUndead.java | 10 +--
.../targethandlers/TargetUnlockable.java | 10 +--
.../CrystalCaverns/CrystalCaverns.java | 14 ++--
40 files changed, 219 insertions(+), 232 deletions(-)
diff --git a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
index fd9dd2c634..9b16863bb4 100644
--- a/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
+++ b/L2J_DataPack_BETA/.settings/org.eclipse.jdt.core.prefs
@@ -1,4 +1,4 @@
-#Sat Oct 01 02:05:53 UYT 2011
+#Mon Oct 03 22:35:58 UYST 2011
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -91,7 +91,7 @@ org.eclipse.jdt.core.formatter.alignment_for_assignment=0
org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48
org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
index 1781d5824f..cdf78736cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
@@ -615,40 +615,40 @@ public class MasterHandler
private static void loadTargetHandlers()
{
- TARGET.registerSkillTargetType(new TargetAlly());
- TARGET.registerSkillTargetType(new TargetArea());
- TARGET.registerSkillTargetType(new TargetAreaCorpseMob());
- TARGET.registerSkillTargetType(new TargetAreaSummon());
- TARGET.registerSkillTargetType(new TargetAreaUndead());
- TARGET.registerSkillTargetType(new TargetAura());
- TARGET.registerSkillTargetType(new TargetAuraCorpseMob());
- TARGET.registerSkillTargetType(new TargetBehindArea());
- TARGET.registerSkillTargetType(new TargetBehindAura());
- TARGET.registerSkillTargetType(new TargetClan());
- TARGET.registerSkillTargetType(new TargetClanMember());
- TARGET.registerSkillTargetType(new TargetCorpseAlly());
- TARGET.registerSkillTargetType(new TargetCorpseClan());
- TARGET.registerSkillTargetType(new TargetCorpseMob());
- TARGET.registerSkillTargetType(new TargetCorpsePet());
- TARGET.registerSkillTargetType(new TargetCorpsePlayer());
- TARGET.registerSkillTargetType(new TargetEnemySummon());
- TARGET.registerSkillTargetType(new TargetFlagPole());
- TARGET.registerSkillTargetType(new TargetFrontArea());
- TARGET.registerSkillTargetType(new TargetFrontAura());
- TARGET.registerSkillTargetType(new TargetGround());
- TARGET.registerSkillTargetType(new TargetHoly());
- TARGET.registerSkillTargetType(new TargetOne());
- TARGET.registerSkillTargetType(new TargetOwnerPet());
- TARGET.registerSkillTargetType(new TargetParty());
- TARGET.registerSkillTargetType(new TargetPartyClan());
- TARGET.registerSkillTargetType(new TargetPartyMember());
- TARGET.registerSkillTargetType(new TargetPartyNotMe());
- TARGET.registerSkillTargetType(new TargetPartyOther());
- TARGET.registerSkillTargetType(new TargetPet());
- TARGET.registerSkillTargetType(new TargetSelf());
- TARGET.registerSkillTargetType(new TargetSummon());
- TARGET.registerSkillTargetType(new TargetUndead());
- TARGET.registerSkillTargetType(new TargetUnlockable());
+ TARGET.registerTargetType(new TargetAlly());
+ TARGET.registerTargetType(new TargetArea());
+ TARGET.registerTargetType(new TargetAreaCorpseMob());
+ TARGET.registerTargetType(new TargetAreaSummon());
+ TARGET.registerTargetType(new TargetAreaUndead());
+ TARGET.registerTargetType(new TargetAura());
+ TARGET.registerTargetType(new TargetAuraCorpseMob());
+ TARGET.registerTargetType(new TargetBehindArea());
+ TARGET.registerTargetType(new TargetBehindAura());
+ TARGET.registerTargetType(new TargetClan());
+ TARGET.registerTargetType(new TargetClanMember());
+ TARGET.registerTargetType(new TargetCorpseAlly());
+ TARGET.registerTargetType(new TargetCorpseClan());
+ TARGET.registerTargetType(new TargetCorpseMob());
+ TARGET.registerTargetType(new TargetCorpsePet());
+ TARGET.registerTargetType(new TargetCorpsePlayer());
+ TARGET.registerTargetType(new TargetEnemySummon());
+ TARGET.registerTargetType(new TargetFlagPole());
+ TARGET.registerTargetType(new TargetFrontArea());
+ TARGET.registerTargetType(new TargetFrontAura());
+ TARGET.registerTargetType(new TargetGround());
+ TARGET.registerTargetType(new TargetHoly());
+ TARGET.registerTargetType(new TargetOne());
+ TARGET.registerTargetType(new TargetOwnerPet());
+ TARGET.registerTargetType(new TargetParty());
+ TARGET.registerTargetType(new TargetPartyClan());
+ TARGET.registerTargetType(new TargetPartyMember());
+ TARGET.registerTargetType(new TargetPartyNotMe());
+ TARGET.registerTargetType(new TargetPartyOther());
+ TARGET.registerTargetType(new TargetPet());
+ TARGET.registerTargetType(new TargetSelf());
+ TARGET.registerTargetType(new TargetSummon());
+ TARGET.registerTargetType(new TargetUndead());
+ TARGET.registerTargetType(new TargetUnlockable());
_log.log(Level.INFO, "Loaded " + TARGET.size() + " Target Handlers");
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EffectSignetMDam.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EffectSignetMDam.java
index 8b1d3a0179..56409fb607 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EffectSignetMDam.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/EffectSignetMDam.java
@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.datatables.NpcTable;
import com.l2jserver.gameserver.idfactory.IdFactory;
import com.l2jserver.gameserver.model.L2Effect;
import com.l2jserver.gameserver.model.L2ItemInstance;
-import com.l2jserver.gameserver.model.L2Skill;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -41,6 +40,7 @@ import com.l2jserver.gameserver.skills.l2skills.L2SkillSignetCasttime;
import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
import com.l2jserver.gameserver.templates.effects.EffectTemplate;
import com.l2jserver.gameserver.templates.skills.L2EffectType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.util.Point3D;
public class EffectSignetMDam extends L2Effect
@@ -85,7 +85,7 @@ public class EffectSignetMDam extends L2Effect
int z = getEffector().getZ();
if (getEffector() instanceof L2PcInstance
- && getSkill().getTargetType() == L2Skill.SkillTargetType.TARGET_GROUND)
+ && getSkill().getTargetType() == L2TargetType.TARGET_GROUND)
{
Point3D wordPosition = ((L2PcInstance) getEffector()).getCurrentSkillWorldPosition();
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
index 3b6b375789..233a09b959 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Disablers.java
@@ -38,6 +38,7 @@ import com.l2jserver.gameserver.skills.Env;
import com.l2jserver.gameserver.skills.Formulas;
import com.l2jserver.gameserver.skills.Stats;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.util.Rnd;
/**
@@ -328,7 +329,7 @@ public class Disablers implements ISkillHandler
{
if (Formulas.calcSkillSuccess(activeChar, target, skill, shld, ss, sps, bss))
{
- if (skill.getTargetType() == L2Skill.SkillTargetType.TARGET_UNDEAD)
+ if (skill.getTargetType() == L2TargetType.TARGET_UNDEAD)
{
if (target.isUndead())
((L2Attackable) target).reduceHate(null, ((L2Attackable) target).getHating(((L2Attackable) target).getMostHated()));
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
index 774ff9f061..0a5cba63b8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Resurrect.java
@@ -21,19 +21,13 @@ import javolution.util.FastList;
import com.l2jserver.gameserver.handler.ISkillHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
import com.l2jserver.gameserver.skills.Formulas;
import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
import com.l2jserver.gameserver.templates.skills.L2SkillType;
-
-/**
- * This class ...
- *
- * @version $Revision: 1.1.2.5.2.4 $ $Date: 2005/04/03 15:55:03 $
- */
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
public class Resurrect implements ISkillHandler
{
@@ -42,10 +36,6 @@ public class Resurrect implements ISkillHandler
L2SkillType.RESURRECT
};
- /**
- *
- * @see com.l2jserver.gameserver.handler.ISkillHandler#useSkill(com.l2jserver.gameserver.model.actor.L2Character, com.l2jserver.gameserver.model.L2Skill, com.l2jserver.gameserver.model.L2Object[])
- */
public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
{
L2PcInstance player = null;
@@ -62,7 +52,7 @@ public class Resurrect implements ISkillHandler
targetPlayer = (L2PcInstance) target;
// Check for same party or for same clan, if target is for clan.
- if (skill.getTargetType() == SkillTargetType.TARGET_CORPSE_CLAN)
+ if (skill.getTargetType() == L2TargetType.TARGET_CORPSE_CLAN)
{
if (player.getClanId() != targetPlayer.getClanId())
continue;
@@ -93,10 +83,6 @@ public class Resurrect implements ISkillHandler
}
}
- /**
- *
- * @see com.l2jserver.gameserver.handler.ISkillHandler#getSkillIds()
- */
public L2SkillType[] getSkillIds()
{
return SKILL_IDS;
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
index 68b63b4969..4745d0e36d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java
@@ -19,19 +19,19 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.TvTEvent;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
/**
* @author UnAfraid
*/
-public class TargetAlly implements ISkillTargetTypeHandler
+public class TargetAlly implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -105,8 +105,8 @@ public class TargetAlly implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_ALLY;
+ return L2TargetType.TARGET_ALLY;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
index d058c7599b..eda839dcc3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java
@@ -19,21 +19,21 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetArea implements ISkillTargetTypeHandler
+public class TargetArea implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -91,8 +91,8 @@ public class TargetArea implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_AREA;
+ return L2TargetType.TARGET_AREA;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
index b390a79da5..0493f4951f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetAreaCorpseMob implements ISkillTargetTypeHandler
+public class TargetAreaCorpseMob implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -71,8 +71,8 @@ public class TargetAreaCorpseMob implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_AREA_CORPSE_MOB;
+ return L2TargetType.TARGET_AREA_CORPSE_MOB;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
index 82464a7806..8303d0b94f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetAreaSummon implements ISkillTargetTypeHandler
+public class TargetAreaSummon implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -76,8 +76,8 @@ public class TargetAreaSummon implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_AREA_SUMMON;
+ return L2TargetType.TARGET_AREA_SUMMON;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaUndead.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaUndead.java
index 44dddb8ca8..73ae7765c8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaUndead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaUndead.java
@@ -21,10 +21,10 @@ import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.GeoData;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetAreaUndead implements ISkillTargetTypeHandler
+public class TargetAreaUndead implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -86,8 +86,8 @@ public class TargetAreaUndead implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_AREA_UNDEAD;
+ return L2TargetType.TARGET_AREA_UNDEAD;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
index c795f08ee8..379e9ee281 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
/**
* @author UnAfraid
*/
-public class TargetAura implements ISkillTargetTypeHandler
+public class TargetAura implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -84,8 +84,8 @@ public class TargetAura implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_AURA;
+ return L2TargetType.TARGET_AURA;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
index b3772a3406..019696d928 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java
@@ -19,17 +19,17 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
/**
* @author UnAfraid
*/
-public class TargetAuraCorpseMob implements ISkillTargetTypeHandler
+public class TargetAuraCorpseMob implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -54,8 +54,8 @@ public class TargetAuraCorpseMob implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_AURA_CORPSE_MOB;
+ return L2TargetType.TARGET_AURA_CORPSE_MOB;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
index 84fcae3f45..76e43cbe89 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetBehindArea implements ISkillTargetTypeHandler
+public class TargetBehindArea implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -94,8 +94,8 @@ public class TargetBehindArea implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_BEHIND_AREA;
+ return L2TargetType.TARGET_BEHIND_AREA;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
index 0ca477afae..bcbf972bdf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
/**
* @author UnAfraid
*/
-public class TargetBehindAura implements ISkillTargetTypeHandler
+public class TargetBehindAura implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -87,8 +87,8 @@ public class TargetBehindAura implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_BEHIND_AURA;
+ return L2TargetType.TARGET_BEHIND_AURA;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
index 56e49c8ed1..c390986b26 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java
@@ -19,12 +19,12 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2ClanMember;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -35,7 +35,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetClan implements ISkillTargetTypeHandler
+public class TargetClan implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -135,8 +135,8 @@ public class TargetClan implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_CLAN;
+ return L2TargetType.TARGET_CLAN;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
index ef17c1cf69..de8869c127 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.util.Util;
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetClanMember implements ISkillTargetTypeHandler
+public class TargetClanMember implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -66,8 +66,8 @@ public class TargetClanMember implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_CLAN_MEMBER;
+ return L2TargetType.TARGET_CLAN_MEMBER;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
index b7084f0fd6..cecfb2da08 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
/**
* @author UnAfraid
*/
-public class TargetCorpseAlly implements ISkillTargetTypeHandler
+public class TargetCorpseAlly implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -111,8 +111,8 @@ public class TargetCorpseAlly implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_CORPSE_ALLY;
+ return L2TargetType.TARGET_CORPSE_ALLY;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
index 23ae104d82..c6c076b205 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java
@@ -19,12 +19,12 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Clan;
import com.l2jserver.gameserver.model.L2ClanMember;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetCorpseClan implements ISkillTargetTypeHandler
+public class TargetCorpseClan implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -138,8 +138,8 @@ public class TargetCorpseClan implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_CORPSE_CLAN;
+ return L2TargetType.TARGET_CORPSE_CLAN;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
index 9e46f1c403..eb60786432 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
import com.l2jserver.Config;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author UnAfraid
*/
-public class TargetCorpseMob implements ISkillTargetTypeHandler
+public class TargetCorpseMob implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -72,8 +72,8 @@ public class TargetCorpseMob implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_CORPSE_MOB;
+ return L2TargetType.TARGET_CORPSE_MOB;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java
index 76cb7f081f..7325bd6e2b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java
@@ -14,17 +14,17 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author UnAfraid
*/
-public class TargetCorpsePet implements ISkillTargetTypeHandler
+public class TargetCorpsePet implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -40,8 +40,8 @@ public class TargetCorpsePet implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_CORPSE_PET;
+ return L2TargetType.TARGET_CORPSE_PET;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
index 33f8c69656..00246065af 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java
@@ -18,10 +18,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PetInstance;
@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
/**
* @author UnAfraid
*/
-public class TargetCorpsePlayer implements ISkillTargetTypeHandler
+public class TargetCorpsePlayer implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -120,8 +120,8 @@ public class TargetCorpsePlayer implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_CORPSE_PLAYER;
+ return L2TargetType.TARGET_CORPSE_PLAYER;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java
index 7171419803..69b4d38766 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java
@@ -14,10 +14,10 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author UnAfraid
*/
-public class TargetEnemySummon implements ISkillTargetTypeHandler
+public class TargetEnemySummon implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -43,8 +43,8 @@ public class TargetEnemySummon implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_ENEMY_SUMMON;
+ return L2TargetType.TARGET_ENEMY_SUMMON;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java
index 225455ed87..14a9177cad 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java
@@ -14,16 +14,16 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
/**
* @author UnAfraid
*/
-public class TargetFlagPole implements ISkillTargetTypeHandler
+public class TargetFlagPole implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -32,8 +32,8 @@ public class TargetFlagPole implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_FLAGPOLE;
+ return L2TargetType.TARGET_FLAGPOLE;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
index ddd365c183..eb337a17b9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Playable;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetFrontArea implements ISkillTargetTypeHandler
+public class TargetFrontArea implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -94,8 +94,8 @@ public class TargetFrontArea implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_FRONT_AREA;
+ return L2TargetType.TARGET_FRONT_AREA;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
index 9c4cccbd34..443358bb13 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -33,7 +33,7 @@ import com.l2jserver.gameserver.templates.skills.L2SkillType;
/**
* @author UnAfraid
*/
-public class TargetFrontAura implements ISkillTargetTypeHandler
+public class TargetFrontAura implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -87,8 +87,8 @@ public class TargetFrontAura implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_FRONT_AURA;
+ return L2TargetType.TARGET_FRONT_AURA;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java
index c83b1b7d81..9b5246e5c3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java
@@ -14,16 +14,16 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
/**
* @author UnAfraid
*/
-public class TargetGround implements ISkillTargetTypeHandler
+public class TargetGround implements ITargetTypeHandler
{
@Override
@@ -33,8 +33,8 @@ public class TargetGround implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_GROUND;
+ return L2TargetType.TARGET_GROUND;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java
index 2e88e88460..f7994db1f2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java
@@ -14,10 +14,10 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2ArtefactInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author UnAfraid
*/
-public class TargetHoly implements ISkillTargetTypeHandler
+public class TargetHoly implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -40,8 +40,8 @@ public class TargetHoly implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_HOLY;
+ return L2TargetType.TARGET_HOLY;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
index 7d99cafdf3..7d2c5ec487 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java
@@ -14,10 +14,10 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.network.SystemMessageId;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
@@ -25,7 +25,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author UnAfraid
*/
-public class TargetOne implements ISkillTargetTypeHandler
+public class TargetOne implements ITargetTypeHandler
{
@Override
@@ -64,8 +64,8 @@ public class TargetOne implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_ONE;
+ return L2TargetType.TARGET_ONE;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java
index 0672c8dff5..760e3e8a8d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java
@@ -14,17 +14,17 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
/**
* @author UnAfraid
*/
-public class TargetOwnerPet implements ISkillTargetTypeHandler
+public class TargetOwnerPet implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -40,8 +40,8 @@ public class TargetOwnerPet implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_OWNER_PET;
+ return L2TargetType.TARGET_OWNER_PET;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
index d31f044dfa..8b0c6bfbae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java
@@ -18,10 +18,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
/**
* @author UnAfraid
*/
-public class TargetParty implements ISkillTargetTypeHandler
+public class TargetParty implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -76,8 +76,8 @@ public class TargetParty implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_PARTY;
+ return L2TargetType.TARGET_PARTY;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
index 9c9a5d2a1f..5883021c68 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java
@@ -19,10 +19,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.TvTEvent;
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.model.entity.TvTEvent;
/**
* @author UnAfraid
*/
-public class TargetPartyClan implements ISkillTargetTypeHandler
+public class TargetPartyClan implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -114,8 +114,8 @@ public class TargetPartyClan implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_PARTY_CLAN;
+ return L2TargetType.TARGET_PARTY_CLAN;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
index 2bb9e04808..cf009a725f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java
@@ -14,10 +14,10 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -27,7 +27,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author UnAfraid
*/
-public class TargetPartyMember implements ISkillTargetTypeHandler
+public class TargetPartyMember implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -63,8 +63,8 @@ public class TargetPartyMember implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_PARTY_MEMBER;
+ return L2TargetType.TARGET_PARTY_MEMBER;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
index 3b79704650..0328200488 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java
@@ -18,10 +18,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.util.Util;
/**
* @author UnAfraid
*/
-public class TargetPartyNotMe implements ISkillTargetTypeHandler
+public class TargetPartyNotMe implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -81,8 +81,8 @@ public class TargetPartyNotMe implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_PARTY_NOTME;
+ return L2TargetType.TARGET_PARTY_NOTME;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
index 37df2a763b..bf2d09a7ab 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java
@@ -14,10 +14,10 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.SystemMessageId;
@@ -26,7 +26,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author UnAfraid
*/
-public class TargetPartyOther implements ISkillTargetTypeHandler
+public class TargetPartyOther implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -67,8 +67,8 @@ public class TargetPartyOther implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_PARTY_OTHER;
+ return L2TargetType.TARGET_PARTY_OTHER;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java
index e3c446d251..2e52703941 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java
@@ -14,16 +14,16 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
/**
* @author UnAfraid
*/
-public class TargetPet implements ISkillTargetTypeHandler
+public class TargetPet implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -36,8 +36,8 @@ public class TargetPet implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_PET;
+ return L2TargetType.TARGET_PET;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java
index 49486dae1b..fa9e862da9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java
@@ -14,16 +14,16 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
/**
* @author UnAfraid
*/
-public class TargetSelf implements ISkillTargetTypeHandler
+public class TargetSelf implements ITargetTypeHandler
{
@Override
@@ -33,8 +33,8 @@ public class TargetSelf implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_SELF;
+ return L2TargetType.TARGET_SELF;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java
index 880fc5a597..e53a59814e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java
@@ -14,17 +14,17 @@
*/
package handlers.targethandlers;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
/**
* @author UnAfraid
*/
-public class TargetSummon implements ISkillTargetTypeHandler
+public class TargetSummon implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -37,8 +37,8 @@ public class TargetSummon implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_SUMMON;
+ return L2TargetType.TARGET_SUMMON;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUndead.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUndead.java
index 08c7be63bc..6dfa68d5f3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUndead.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUndead.java
@@ -18,10 +18,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.instance.L2SummonInstance;
@@ -31,7 +31,7 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
/**
* @author UnAfraid
*/
-public class TargetUndead implements ISkillTargetTypeHandler
+public class TargetUndead implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -60,8 +60,8 @@ public class TargetUndead implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_UNDEAD;
+ return L2TargetType.TARGET_UNDEAD;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
index 612f71c234..70390912d8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java
@@ -18,10 +18,10 @@ import java.util.List;
import javolution.util.FastList;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.instance.L2ChestInstance;
import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
/**
* @author UnAfraid
*/
-public class TargetUnlockable implements ISkillTargetTypeHandler
+public class TargetUnlockable implements ITargetTypeHandler
{
@Override
public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
@@ -50,8 +50,8 @@ public class TargetUnlockable implements ISkillTargetTypeHandler
}
@Override
- public Enum<SkillTargetType> getTargetType()
+ public Enum<L2TargetType> getTargetType()
{
- return SkillTargetType.TARGET_UNLOCKABLE;
+ return L2TargetType.TARGET_UNLOCKABLE;
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
index 42ccaaad82..63fcedbcf8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/instances/CrystalCaverns/CrystalCaverns.java
@@ -31,7 +31,6 @@ import com.l2jserver.gameserver.model.L2ItemInstance;
import com.l2jserver.gameserver.model.L2Object;
import com.l2jserver.gameserver.model.L2Party;
import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
import com.l2jserver.gameserver.model.L2World;
import com.l2jserver.gameserver.model.Location;
import com.l2jserver.gameserver.model.actor.L2Attackable;
@@ -59,6 +58,7 @@ import com.l2jserver.gameserver.network.serverpackets.SocialAction;
import com.l2jserver.gameserver.network.serverpackets.SpecialCamera;
import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
import com.l2jserver.gameserver.network.serverpackets.ValidateLocation;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
import com.l2jserver.gameserver.util.Util;
import com.l2jserver.util.Rnd;
@@ -910,12 +910,12 @@ public class CrystalCaverns extends Quest
else if (!world.copys.isEmpty())
{
boolean notAOE = true;
- if (skill != null && (skill.getTargetType() == SkillTargetType.TARGET_AREA
- || skill.getTargetType() == SkillTargetType.TARGET_FRONT_AREA
- || skill.getTargetType() == SkillTargetType.TARGET_BEHIND_AREA
- || skill.getTargetType() == SkillTargetType.TARGET_AURA
- || skill.getTargetType() == SkillTargetType.TARGET_FRONT_AURA
- || skill.getTargetType() == SkillTargetType.TARGET_BEHIND_AURA))
+ if (skill != null && (skill.getTargetType() == L2TargetType.TARGET_AREA
+ || skill.getTargetType() == L2TargetType.TARGET_FRONT_AREA
+ || skill.getTargetType() == L2TargetType.TARGET_BEHIND_AREA
+ || skill.getTargetType() == L2TargetType.TARGET_AURA
+ || skill.getTargetType() == L2TargetType.TARGET_FRONT_AURA
+ || skill.getTargetType() == L2TargetType.TARGET_BEHIND_AURA))
notAOE = false;
if (notAOE)
{
--
GitLab