Sync with L2jServer HighFive Mar 1st 2015.

This commit is contained in:
mobius
2015-03-01 22:48:14 +00:00
parent f14af24b41
commit 6fa0ed56e3
116 changed files with 971 additions and 676 deletions

View File

@@ -52,25 +52,21 @@ public final class Detection extends AbstractEffect
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.isInvisible())
{
if (hasParty && (target.isInParty()) && (player.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId()))
if (player.isInPartyWith(target))
{
return;
}
else if (hasClan && (player.getClanId() == target.getClanId()))
if (player.isInClanWith(target))
{
return;
}
else if (hasAlly && (player.getAllyId() == target.getAllyId()))
if (player.isInAllyWith(target))
{
return;
}
// Remove Hide.
target.getEffectList().stopSkillEffects(true, AbnormalType.HIDE);
}