diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
index 780e0bc8d3e4fdd7176409c6aecc54b3f6369882..5aea66d2143a793bac4a2bea6c2b02c839a00781 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/EffectMasterHandler.java
@@ -76,6 +76,7 @@ public final class EffectMasterHandler
DefenceTrait.class,
DeleteHate.class,
DeleteHateOfMe.class,
+ Detection.class,
Disarm.class,
DispelAll.class,
DispelByCategory.class,
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 f4425eab0be5028a6cab7815604357588608823d..b986f9942c93981386b968f249babff57a82aeae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/MasterHandler.java
@@ -205,7 +205,6 @@ import handlers.punishmenthandlers.BanHandler;
import handlers.punishmenthandlers.ChatBanHandler;
import handlers.punishmenthandlers.JailHandler;
import handlers.skillhandlers.DeluxeKey;
-import handlers.skillhandlers.Detection;
import handlers.skillhandlers.Dummy;
import handlers.skillhandlers.NornilsPower;
import handlers.skillhandlers.Sow;
@@ -493,7 +492,6 @@ public class MasterHandler
{
// Skill Handlers
DeluxeKey.class,
- Detection.class,
Dummy.class,
NornilsPower.class,
Sow.class,
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Detection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Detection.java
new file mode 100644
index 0000000000000000000000000000000000000000..230158afdc783af86a772b4fcc4c43a0b915433e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/Detection.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (C) 2004-2014 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import com.l2jserver.gameserver.model.StatsSet;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.conditions.Condition;
+import com.l2jserver.gameserver.model.effects.AbstractEffect;
+import com.l2jserver.gameserver.model.skills.AbnormalType;
+import com.l2jserver.gameserver.model.skills.BuffInfo;
+
+/**
+ * @author UnAfraid
+ */
+public class Detection extends AbstractEffect
+{
+ public Detection(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
+ {
+ super(attachCond, applyCond, set, params);
+ }
+
+ @Override
+ public boolean isInstant()
+ {
+ return true;
+ }
+
+ @Override
+ public void onStart(BuffInfo info)
+ {
+ super.onStart(info);
+ if (!info.getEffector().isPlayer() || !info.getEffected().isPlayer())
+ {
+ return;
+ }
+ final L2PcInstance player = info.getEffector().getActingPlayer();
+ final L2PcInstance target = info.getEffected().getActingPlayer();
+ final boolean hasParty = player.isInParty();
+ final boolean hasClan = player.getClanId() > 0;
+ final boolean hasAlly = player.getAllyId() > 0;
+
+ if (target.getAppearance().getInvisible())
+ {
+ if (hasParty && (target.isInParty()) && (player.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId()))
+ {
+ return;
+ }
+ else if (hasClan && (player.getClanId() == target.getClanId()))
+ {
+ return;
+ }
+ else if (hasAlly && (player.getAllyId() == target.getAllyId()))
+ {
+ return;
+ }
+
+ // Remove Hide.
+ target.getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
+ }
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
deleted file mode 100644
index 7ac2a3e8264c1b5322b8c47124e8cc4883a5230d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/skillhandlers/Detection.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2004-2014 L2J DataPack
- *
- * This file is part of L2J DataPack.
- *
- * L2J DataPack is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * L2J DataPack is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-package handlers.skillhandlers;
-
-import com.l2jserver.gameserver.handler.ISkillHandler;
-import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.AbnormalType;
-import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
-
-/**
- * @author ZaKax
- */
-public class Detection implements ISkillHandler
-{
- private static final L2SkillType[] SKILL_IDS =
- {
- L2SkillType.DETECTION
- };
-
- @Override
- public void useSkill(L2Character activeChar, L2Skill skill, L2Object[] targets)
- {
- final boolean hasParty;
- final boolean hasClan;
- final boolean hasAlly;
- final L2PcInstance player = activeChar.getActingPlayer();
- if (player != null)
- {
- hasParty = player.isInParty();
- hasClan = player.getClanId() > 0;
- hasAlly = player.getAllyId() > 0;
-
- for (L2PcInstance target : activeChar.getKnownList().getKnownPlayersInRadius(skill.getAffectRange()))
- {
- if ((target != null) && target.getAppearance().getInvisible())
- {
- if (hasParty && (target.getParty() != null) && (player.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId()))
- {
- continue;
- }
- if (hasClan && (player.getClanId() == target.getClanId()))
- {
- continue;
- }
- if (hasAlly && (player.getAllyId() == target.getAllyId()))
- {
- continue;
- }
-
- // Remove Hide.
- target.getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
- }
- }
- }
- }
-
- @Override
- public L2SkillType[] getSkillIds()
- {
- return SKILL_IDS;
- }
-}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
index f8d9328ce3aed3ce058da92cf02f0f44703112d8..7fa63b68d8895df48d5ad94f8265ae13b403a96a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
@@ -826,8 +826,10 @@
<set name="mpConsume" val="67" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="8000" />
- <set name="skillType" val="DETECTION" />
- <set name="targetType" val="SELF" /> <!-- NOTE: Using SELF due AURA is handled by skillType DETECTION -->
+ <set name="targetType" val="AURA" />
+ <for>
+ <effect name="Detection" />
+ </for>
</skill>
<skill id="934" levels="1" name="Sigil Mastery">
<set name="icon" val="icon.skill0925" />