Fixed AutoLootHerbs configuration not triggering herb skills.

This commit is contained in:
MobiusDevelopment
2021-09-16 21:44:14 +00:00
parent cc50309000
commit 925709a804
2 changed files with 8 additions and 16 deletions

View File

@@ -3367,17 +3367,13 @@ public class PlayerInstance extends Playable
} }
// Auto-use herbs. // Auto-use herbs.
if (item.hasExImmediateEffect()) if (item.hasExImmediateEffect() && item.isEtcItem())
{ {
final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof EtcItem ? (EtcItem) item : null); for (SkillHolder skillHolder : item.getSkills())
if (handler == null)
{ {
LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); doSimultaneousCast(skillHolder.getSkill());
}
else
{
handler.useItem(this, new ItemInstance(itemId), false);
} }
broadcastInfo();
} }
else else
{ {

View File

@@ -3278,17 +3278,13 @@ public class PlayerInstance extends Playable
} }
// Auto-use herbs. // Auto-use herbs.
if (item.hasExImmediateEffect()) if (item.hasExImmediateEffect() && item.isEtcItem())
{ {
final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof EtcItem ? (EtcItem) item : null); for (SkillHolder skillHolder : item.getSkills())
if (handler == null)
{ {
LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!"); doSimultaneousCast(skillHolder.getSkill());
}
else
{
handler.useItem(this, new ItemInstance(itemId), false);
} }
broadcastInfo();
} }
else else
{ {