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

Check if pet is dead or at full HP when using potions.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-10-22 00:05:43 +00:00
parent 563e0cf320
commit 800c42fd4e
4 changed files with 76 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -167,25 +167,29 @@ public class AutoUseTaskManager implements Runnable
if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone) if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone)
{ {
final Pet pet = player.getPet(); final Pet pet = player.getPet();
if ((pet != null) && (pet.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPetPotionPercent())) if ((pet != null) && !pet.isDead())
{ {
POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems()) final int percent = pet.getCurrentHpPercent();
if ((percent < 100) && (percent <= player.getAutoPlaySettings().getAutoPetPotionPercent()))
{ {
final Item item = player.getInventory().getItemByItemId(itemId.intValue()); POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems())
if (item == null)
{ {
player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId); final Item item = player.getInventory().getItemByItemId(itemId.intValue());
continue POTIONS; if (item == null)
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{ {
player.addTimeStampItem(item, reuseDelay); player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId);
continue POTIONS;
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{
player.addTimeStampItem(item, reuseDelay);
}
} }
} }
} }

34
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -167,25 +167,29 @@ public class AutoUseTaskManager implements Runnable
if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone) if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone)
{ {
final Pet pet = player.getPet(); final Pet pet = player.getPet();
if ((pet != null) && (pet.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPetPotionPercent())) if ((pet != null) && !pet.isDead())
{ {
POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems()) final int percent = pet.getCurrentHpPercent();
if ((percent < 100) && (percent <= player.getAutoPlaySettings().getAutoPetPotionPercent()))
{ {
final Item item = player.getInventory().getItemByItemId(itemId.intValue()); POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems())
if (item == null)
{ {
player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId); final Item item = player.getInventory().getItemByItemId(itemId.intValue());
continue POTIONS; if (item == null)
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{ {
player.addTimeStampItem(item, reuseDelay); player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId);
continue POTIONS;
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{
player.addTimeStampItem(item, reuseDelay);
}
} }
} }
} }

34
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -167,25 +167,29 @@ public class AutoUseTaskManager implements Runnable
if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone) if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone)
{ {
final Pet pet = player.getPet(); final Pet pet = player.getPet();
if ((pet != null) && (pet.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPetPotionPercent())) if ((pet != null) && !pet.isDead())
{ {
POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems()) final int percent = pet.getCurrentHpPercent();
if ((percent < 100) && (percent <= player.getAutoPlaySettings().getAutoPetPotionPercent()))
{ {
final Item item = player.getInventory().getItemByItemId(itemId.intValue()); POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems())
if (item == null)
{ {
player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId); final Item item = player.getInventory().getItemByItemId(itemId.intValue());
continue POTIONS; if (item == null)
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{ {
player.addTimeStampItem(item, reuseDelay); player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId);
continue POTIONS;
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{
player.addTimeStampItem(item, reuseDelay);
}
} }
} }
} }

34
L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/taskmanager/AutoUseTaskManager.java
View File

@@ -167,25 +167,29 @@ public class AutoUseTaskManager implements Runnable
if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone) if (Config.ENABLE_AUTO_PET_POTION && !isInPeaceZone)
{ {
final Pet pet = player.getPet(); final Pet pet = player.getPet();
if ((pet != null) && (pet.getCurrentHpPercent() <= player.getAutoPlaySettings().getAutoPetPotionPercent())) if ((pet != null) && !pet.isDead())
{ {
POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems()) final int percent = pet.getCurrentHpPercent();
if ((percent < 100) && (percent <= player.getAutoPlaySettings().getAutoPetPotionPercent()))
{ {
final Item item = player.getInventory().getItemByItemId(itemId.intValue()); POTIONS: for (Integer itemId : player.getAutoUseSettings().getAutoPetPotionItems())
if (item == null)
{ {
player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId); final Item item = player.getInventory().getItemByItemId(itemId.intValue());
continue POTIONS; if (item == null)
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{ {
player.addTimeStampItem(item, reuseDelay); player.getAutoUseSettings().getAutoPetPotionItems().remove(itemId);
continue POTIONS;
}
final int reuseDelay = item.getReuseDelay();
if ((reuseDelay <= 0) || (player.getItemRemainingReuseTime(item.getObjectId()) <= 0))
{
final EtcItem etcItem = item.getEtcItem();
final IItemHandler handler = ItemHandler.getInstance().getHandler(etcItem);
if ((handler != null) && handler.useItem(player, item, false) && (reuseDelay > 0))
{
player.addTimeStampItem(item, reuseDelay);
}
} }
} }
} }