lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
trunk/dist/game/data/scripts/handlers/targethandlers/PartyNotMe.java vendored
View File

@@ -40,39 +40,32 @@ public class PartyNotMe implements ITargetTypeHandler
final int radius = skill.getAffectRange();
if (activeChar.getParty() != null)
{
final List<L2PcInstance> partyList = activeChar.getParty().getMembers();
for (L2PcInstance partyMember : partyList)
for (L2PcInstance partyMember : activeChar.getParty().getMembers())
{
if (partyMember == activeChar)
if ((partyMember == activeChar) || !Util.checkIfInRange(Config.ALT_PARTY_RANGE, activeChar, partyMember, true))
{
continue;
}
else if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, activeChar, partyMember, true))
if (Skill.addPet(activeChar, partyMember, radius, false))
{
continue;
targetList.add(partyMember.getPet());
}
else
partyMember.getServitors().values().forEach(s ->
{
if (Skill.addPet(activeChar, partyMember, radius, false))
if (Skill.addCharacter(activeChar, s, radius, false))
{
targetList.add(partyMember.getPet());
targetList.add(s);
}
partyMember.getServitors().values().forEach(s ->
{
if (Skill.addCharacter(activeChar, s, radius, false))
{
targetList.add(s);
}
});
if (Skill.addCharacter(activeChar, partyMember, radius, false))
{
targetList.add(partyMember);
}
});
if (Skill.addCharacter(activeChar, partyMember, radius, false))
{
targetList.add(partyMember);
}
targetList.add(partyMember);
}
}
return targetList.toArray(new L2Character[targetList.size()]);