Use this keyword to reference the skill in method applyEffectScope.
This commit is contained in:
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
@@ -1229,26 +1229,26 @@ public final class Skill implements IIdentifiable
|
|||||||
{
|
{
|
||||||
if (effect.isInstant())
|
if (effect.isInstant())
|
||||||
{
|
{
|
||||||
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (applyInstantEffects && effect.calcSuccess(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
effect.instant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.instant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (addContinuousEffects)
|
else if (addContinuousEffects)
|
||||||
{
|
{
|
||||||
if (applyInstantEffects)
|
if (applyInstantEffects)
|
||||||
{
|
{
|
||||||
effect.continuousInstant(info.getEffector(), info.getEffected(), info.getSkill(), info.getItem());
|
effect.continuousInstant(info.getEffector(), info.getEffected(), this, info.getItem());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (effect.canStart(info.getEffector(), info.getEffected(), info.getSkill()))
|
if (effect.canStart(info.getEffector(), info.getEffected(), this))
|
||||||
{
|
{
|
||||||
info.addEffect(effect);
|
info.addEffect(effect);
|
||||||
}
|
}
|
||||||
|
|
||||||
// tempfix for hp/mp regeneration
|
// tempfix for hp/mp regeneration
|
||||||
// TODO: Find where regen stops and make a proper fix
|
// TODO: Find where regen stops and make a proper fix
|
||||||
if (info.getEffected().isPlayer() && !info.getSkill().isBad())
|
if (info.getEffected().isPlayer() && !isBad())
|
||||||
{
|
{
|
||||||
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
info.getEffected().getActingPlayer().getStatus().startHpMpRegeneration();
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user