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

Sync with L2JServer Jan 24th 2015.

Browse Source
This commit is contained in:
mobius
2015-01-24 20:02:32 +00:00
parent d349bd3924
commit 1c6301c46d
1012 changed files with 23069 additions and 6307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
trunk/dist/game/data/scripts/handlers/targethandlers/Clan.java vendored
View File

@ -74,11 +74,19 @@ public class Clan implements ITargetTypeHandler
final int radius = skill.getAffectRange();
final L2Clan clan = player.getClan();
if (Skill.addSummon(activeChar, player, radius, false))
if (Skill.addPet(activeChar, player, radius, false))
{
targetList.add(player.getSummon());
targetList.add(player.getPet());
}
player.getServitors().values().forEach(s ->
{
if (Skill.addCharacter(activeChar, s, radius, false))
{
targetList.add(s);
}
});
if (clan != null)
{
L2PcInstance obj;
@ -114,11 +122,19 @@ public class Clan implements ITargetTypeHandler
continue;
}
if (!onlyFirst && Skill.addSummon(activeChar, obj, radius, false))
if (Skill.addPet(activeChar, obj, radius, false))
{
targetList.add(obj.getSummon());
targetList.add(obj.getPet());
}
obj.getServitors().values().forEach(s ->
{
if (Skill.addCharacter(activeChar, s, radius, false))
{
targetList.add(s);
}
});
if (!Skill.addCharacter(activeChar, obj, radius, false))
{
continue;