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

Fixed AutoLootHerbs configuration not triggering herb skills.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_8.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -227,6 +227,7 @@ import org.l2jmobius.gameserver.model.holders.PlayerEventHolder;
import org.l2jmobius.gameserver.model.holders.PreparedMultisellListHolder;
import org.l2jmobius.gameserver.model.holders.RecipeHolder;
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.TimedHuntingZoneHolder;
@@ -241,7 +242,6 @@ import org.l2jmobius.gameserver.model.itemcontainer.PlayerInventory;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerRefund;
import org.l2jmobius.gameserver.model.itemcontainer.PlayerWarehouse;
import org.l2jmobius.gameserver.model.items.Armor;
import org.l2jmobius.gameserver.model.items.EtcItem;
import org.l2jmobius.gameserver.model.items.Henna;
import org.l2jmobius.gameserver.model.items.Item;
import org.l2jmobius.gameserver.model.items.Weapon;
@@ -3326,17 +3326,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
{