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

Fixed double scroll of escape consumption.

Browse Source
This commit is contained in:
MobiusDev 2016-08-17 12:37:25 +00:00
parent 9346d18842
commit 4b023f8387
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/skills/SkillCaster.java
View File

@ -55,6 +55,7 @@ import com.l2jmobius.gameserver.model.holders.SkillUseHolder;
import com.l2jmobius.gameserver.model.items.L2Item; import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.items.L2Weapon; import com.l2jmobius.gameserver.model.items.L2Weapon;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.items.type.ActionType;
import com.l2jmobius.gameserver.model.options.OptionsSkillHolder; import com.l2jmobius.gameserver.model.options.OptionsSkillHolder;
import com.l2jmobius.gameserver.model.options.OptionsSkillType; import com.l2jmobius.gameserver.model.options.OptionsSkillType;
import com.l2jmobius.gameserver.model.skills.targets.TargetType; import com.l2jmobius.gameserver.model.skills.targets.TargetType;
@ -314,10 +315,17 @@ public class SkillCaster implements Runnable
} }
// Consume the required items. Should happen after use message is displayed and SetupGauge // Consume the required items. Should happen after use message is displayed and SetupGauge
if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0) && !caster.destroyItemByItemId(_skill.toString(), _skill.getItemConsumeId(), _skill.getItemConsumeCount(), null, true)) if ((_skill.getItemConsumeId() > 0) && (_skill.getItemConsumeCount() > 0))
{
if ((_item != null) && (_item.getItem().getDefaultAction() == ActionType.SKILL_REDUCE))
{ {
return false; return false;
} }
if (!caster.destroyItemByItemId(_skill.toString(), _skill.getItemConsumeId(), _skill.getItemConsumeCount(), target, true))
{
return false;
}
}
// Trigger any skill cast start effects. // Trigger any skill cast start effects.
if (target.isCharacter()) if (target.isCharacter())