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

18
trunk/dist/game/data/scripts/handlers/targethandlers/AreaSummon.java vendored
View File

@@ -42,15 +42,12 @@ public class AreaSummon implements ITargetTypeHandler
return EMPTY_TARGET_LIST;
}
if (onlyFirst)
if (onlyFirst && activeChar.hasSummon())
{
if (activeChar.hasSummon())
return new L2Character[]
{
return new L2Character[]
{
activeChar.getServitors().values().stream().findFirst().orElse(activeChar.getPet())
};
}
activeChar.getServitors().values().stream().findFirst().orElse(activeChar.getPet())
};
}
final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
@@ -87,12 +84,7 @@ public class AreaSummon implements ITargetTypeHandler
targetList.add(obj);
}
if (targetList.isEmpty())
{
return EMPTY_TARGET_LIST;
}
return targetList.toArray(new L2Character[targetList.size()]);
return targetList.isEmpty() ? EMPTY_TARGET_LIST : targetList.toArray(new L2Character[targetList.size()]);
}
@Override