Fixed AutoLootHerbs configuration not triggering herb skills.

This commit is contained in:
MobiusDevelopment
2021-09-16 15:10:15 +00:00
parent 1d79d839a0
commit cc50309000
19 changed files with 95 additions and 156 deletions

View File

@@ -219,6 +219,7 @@ import org.l2jmobius.gameserver.model.holders.MovieHolder;
import org.l2jmobius.gameserver.model.holders.PlayerEventHolder;
import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
import org.l2jmobius.gameserver.model.holders.SellBuffHolder;
import org.l2jmobius.gameserver.model.holders.SkillHolder;
import org.l2jmobius.gameserver.model.holders.SkillUseHolder;
import org.l2jmobius.gameserver.model.holders.SubClassHolder;
import org.l2jmobius.gameserver.model.holders.TrainingHolder;
@@ -3323,17 +3324,13 @@ public class PlayerInstance extends Playable
}
// Auto-use herbs.
if (item.hasExImmediateEffect())
if (item.hasExImmediateEffect() && item.isEtcItem())
{
final IItemHandler handler = ItemHandler.getInstance().getHandler(item instanceof EtcItem ? (EtcItem) item : null);
if (handler == null)
for (SkillHolder skillHolder : item.getAllSkills())
{
LOGGER.warning("No item handler registered for Herb ID " + item.getId() + "!");
}
else
{
handler.useItem(this, new ItemInstance(itemId), false);
SkillCaster.triggerCast(this, null, skillHolder.getSkill(), null, false);
}
broadcastInfo();
}
else
{