Sync with L2JServer Jan 24th 2015.

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

View File

@ -52,6 +52,7 @@ import com.l2jserver.gameserver.model.PcCondOverride;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -941,10 +942,18 @@ public final class FinalEmperialTomb extends Quest
{
targetList.add(player);
}
if (player.hasSummon() && !player.getSummon().isDead())
final L2Summon pet = player.getPet();
if ((pet != null) && !pet.isDead())
{
targetList.add(player.getSummon());
targetList.add(pet);
}
player.getServitors().values().forEach(s ->
{
if (!s.isDead())
{
targetList.add(s);
}
});
}
}
}