Various pet related fixes.

This commit is contained in:
MobiusDev
2017-01-08 11:05:53 +00:00
parent cb60ead6c1
commit b30c70e704
6 changed files with 42 additions and 32 deletions

View File

@@ -61,8 +61,9 @@ public class BeastSoulShot implements IItemHandler
}
final List<L2Summon> aliveServitor = playable.getServitors().values().stream().filter(s -> !s.isDead()).collect(Collectors.toList());
if (aliveServitor.isEmpty())
if ((pet == null) && aliveServitor.isEmpty())
{
activeOwner.sendMessage("asdas");
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
return false;
}

View File

@@ -61,7 +61,7 @@ public class BeastSpiritShot implements IItemHandler
}
final List<L2Summon> aliveServitor = playable.getServitors().values().stream().filter(s -> !s.isDead()).collect(Collectors.toList());
if (aliveServitor.isEmpty())
if ((pet == null) && aliveServitor.isEmpty())
{
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
return false;

View File

@@ -50,6 +50,5 @@ public final class PetAttack implements IPlayerActionHandler
{
pet.doAttack(activeChar.getTarget());
}
}
}