Merged with released L2J-Unity files.

trunk/dist/game/data/scripts/handlers/effecthandlers/Detection.java

@@ -1,59 +1,76 @@
-/*
- * This file is part of the L2J Mobius project.
- * 
- * This program 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.
- * 
- * This program 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.l2jmobius.gameserver.model.StatsSet;
-import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jmobius.gameserver.model.conditions.Condition;
-import com.l2jmobius.gameserver.model.effects.AbstractEffect;
-import com.l2jmobius.gameserver.model.skills.AbnormalType;
-import com.l2jmobius.gameserver.model.skills.BuffInfo;
-
-/**
- * Detection effect implementation.
- * @author UnAfraid
- */
-public final 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)
-	{
-		if (!info.getEffector().isPlayer() || !info.getEffected().isPlayer())
-		{
-			return;
-		}
-		final L2PcInstance player = info.getEffector().getActingPlayer();
-		final L2PcInstance target = info.getEffected().getActingPlayer();
-		if (!target.isInvisible() || player.isInPartyWith(target) || player.isInClanWith(target) || player.isInAllyWith(target))
-		{
-			return;
-		}
-		// Remove Hide.
-		target.getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
-	}
-}
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program 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.
+ * 
+ * This program 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.l2jmobius.gameserver.model.StatsSet;
+import com.l2jmobius.gameserver.model.actor.L2Character;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.effects.AbstractEffect;
+import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
+import com.l2jmobius.gameserver.model.skills.AbnormalType;
+import com.l2jmobius.gameserver.model.skills.Skill;
+
+/**
+ * Detection effect implementation.
+ * @author UnAfraid
+ */
+public final class Detection extends AbstractEffect
+{
+	public Detection(StatsSet params)
+	{
+	}
+	
+	@Override
+	public boolean isInstant()
+	{
+		return true;
+	}
+	
+	@Override
+	public void instant(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item)
+	{
+		if (!effector.isPlayer() || !effected.isPlayer())
+		{
+			return;
+		}
+		
+		final L2PcInstance player = effector.getActingPlayer();
+		final L2PcInstance target = effected.getActingPlayer();
+		final boolean hasParty = player.isInParty();
+		final boolean hasClan = player.getClanId() > 0;
+		final boolean hasAlly = player.getAllyId() > 0;
+		
+		if (target.isInvisible())
+		{
+			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);
+		}
+	}
+}