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

Separated isSkillDisabled from isSkillDisabledByReuse.

Browse Source
This commit is contained in:
MobiusDev 2018-06-07 20:36:36 +00:00
parent f0896c5346
commit 44d2d37c69
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/ai/areas/PrimevalIsle/PrimevalIsle.java vendored
View File

@ -277,7 +277,7 @@ public final class PrimevalIsle extends AbstractNpcAI
{ {
if (getRandom(100) <= (probPhysicalSpecial1 * npc.getVariables().getInt("SKILL_MULTIPLER"))) if (getRandom(100) <= (probPhysicalSpecial1 * npc.getVariables().getInt("SKILL_MULTIPLER")))
{ {
if (!npc.isSkillDisabled(physicalSpecial1.getSkillId())) if (!npc.isSkillDisabled(physicalSpecial1.getSkill()))
{ {
npc.setTarget(creature); npc.setTarget(creature);
npc.doCast(physicalSpecial1.getSkill()); npc.doCast(physicalSpecial1.getSkill());
@ -420,7 +420,7 @@ public final class PrimevalIsle extends AbstractNpcAI
final L2Attackable mob = (L2Attackable) npc; final L2Attackable mob = (L2Attackable) npc;
target = mob.getMostHated(); target = mob.getMostHated();
mob.clearAggroList(); mob.clearAggroList();
if (!npc.isSkillDisabled(selfRangeBuff1.getSkillId())) if (!npc.isSkillDisabled(selfRangeBuff1.getSkill()))
{ {
npc.getVariables().set("SELFBUFF_USED", 1); npc.getVariables().set("SELFBUFF_USED", 1);
npc.doCast(selfRangeBuff1.getSkill()); npc.doCast(selfRangeBuff1.getSkill());

11
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2332,7 +2332,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return false; return false;
} }
if (_allSkillsDisabled) if (isAllSkillsDisabled())
{ {
return true; return true;
} }
@ -2342,7 +2342,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
return true; return true;
} }
return isSkillDisabled(skill.getReuseHashCode()); return isSkillDisabledByReuse(skill.getReuseHashCode());
} }
/** /**
@ -2350,13 +2350,8 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
* @param hashCode the skill hash code * @param hashCode the skill hash code
* @return {@code true} if the skill is disabled, {@code false} otherwise * @return {@code true} if the skill is disabled, {@code false} otherwise
*/ */
public boolean isSkillDisabled(int hashCode) public boolean isSkillDisabledByReuse(int hashCode)
{ {
if (isAllSkillsDisabled())
{
return true;
}
if (_disabledSkills == null) if (_disabledSkills == null)
{ {
return false; return false;