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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
trunk/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
View File

@@ -285,9 +285,7 @@ public final class BuffInfo
{
// The task for the effect ticks.
final EffectTickTask effectTask = new EffectTickTask(this, effect);
final ScheduledFuture<?> scheduledFuture = ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(effectTask, effect.getTicks() * Config.EFFECT_TICK_RATIO, effect.getTicks() * Config.EFFECT_TICK_RATIO);
// Adds the task for ticking.
addTask(effect, new EffectTaskInfo(effectTask, scheduledFuture));
addTask(effect, new EffectTaskInfo(effectTask, ThreadPoolManager.getInstance().scheduleEffectAtFixedRate(effectTask, effect.getTicks() * Config.EFFECT_TICK_RATIO, effect.getTicks() * Config.EFFECT_TICK_RATIO)));
}
// Add stats.
@@ -303,23 +301,18 @@ public final class BuffInfo
*/
public void onTick(AbstractEffect effect, int tickCount)
{
boolean continueForever = false;
// If the effect is in use, allow it to affect the effected.
if (_isInUse)
final boolean continueForever = _isInUse && effect.onActionTime(this);
if (continueForever || !_skill.isToggle())
{
// Callback for on action time event.
continueForever = effect.onActionTime(this);
return;
}
if (!continueForever && _skill.isToggle())
final EffectTaskInfo task = getEffectTask(effect);
if (task == null)
{
final EffectTaskInfo task = getEffectTask(effect);
if (task != null)
{
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
_effected.getEffectList().stopSkillEffects(true, getSkill()); // Remove the buff from the effect list.
}
return;
}
task.getScheduledFuture().cancel(true); // Don't allow to finish current run.
_effected.getEffectList().stopSkillEffects(true, getSkill());
}
public void finishEffects()

64
trunk/java/com/l2jmobius/gameserver/model/skills/Skill.java
View File

@@ -1098,11 +1098,7 @@ public final class Skill implements IIdentifiable
public L2Object getFirstOfTargetList(L2Character activeChar)
{
final L2Object[] targets = getTargetList(activeChar, true);
if (targets.length == 0)
{
return null;
}
return targets[0];
return targets.length == 0 ? null : targets[0];
}
/**
@@ -1223,11 +1219,7 @@ public final class Skill implements IIdentifiable
public static final boolean addPet(L2Character caster, L2PcInstance owner, int radius, boolean isDead)
{
final L2Summon pet = owner.getPet();
if (pet == null)
{
return false;
}
return addCharacter(caster, pet, radius, isDead);
return (pet != null) && addCharacter(caster, pet, radius, isDead);
}
public static final boolean addCharacter(L2Character caster, L2Character target, int radius, boolean isDead)
@@ -1311,12 +1303,9 @@ public final class Skill implements IIdentifiable
effect.onStart(info);
}
}
else if (addContinuousEffects)
else if (addContinuousEffects && effect.canStart(info))
{
if (effect.canStart(info))
{
info.addEffect(effect);
}
info.addEffect(effect);
}
}
}
@@ -1413,15 +1402,12 @@ public final class Skill implements IIdentifiable
}
// Support for buff sharing feature including healing herbs.
if (effected.isPlayer() && effected.hasServitors() && !isTransformation() && (getAbnormalType() != AbnormalType.SUMMON_CONDITION))
if (effected.isPlayer() && effected.hasServitors() && !isTransformation() && (getAbnormalType() != AbnormalType.SUMMON_CONDITION) && ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb()))
{
if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb())
effected.getServitors().values().forEach(s ->
{
effected.getServitors().values().forEach(s ->
{
applyEffects(effector, s, isRecoveryHerb(), 0);
});
}
applyEffects(effector, s, isRecoveryHerb(), 0);
});
}
}
@@ -1807,28 +1793,30 @@ public final class Skill implements IIdentifiable
*/
private void parseAbnormalVisualEffect(String abnormalVisualEffects)
{
if (abnormalVisualEffects != null)
if (abnormalVisualEffects == null)
{
final String[] data = abnormalVisualEffects.split(";");
final Set<AbnormalVisualEffect> aves = new HashSet<>(1);
for (String aveString : data)
return;
}
final String[] data = abnormalVisualEffects.split(";");
final Set<AbnormalVisualEffect> aves = new HashSet<>(1);
for (String aveString : data)
{
final AbnormalVisualEffect ave = AbnormalVisualEffect.findByName(aveString);
if (ave != null)
{
final AbnormalVisualEffect ave = AbnormalVisualEffect.findByName(aveString);
if (ave != null)
{
aves.add(ave);
}
else
{
_log.warning("Invalid AbnormalVisualEffect(" + aveString + ") found for Skill(" + this + ")");
}
aves.add(ave);
}
if (!aves.isEmpty())
else
{
_abnormalVisualEffects = aves;
_log.warning("Invalid AbnormalVisualEffect(" + aveString + ") found for Skill(" + this + ")");
}
}
if (!aves.isEmpty())
{
_abnormalVisualEffects = aves;
}
}
public L2ExtractableSkill getExtractableSkill()

7
trunk/java/com/l2jmobius/gameserver/model/skills/SkillChannelizer.java
View File

@@ -120,14 +120,11 @@ public class SkillChannelizer implements Runnable
@Override
public void run()
{
if (!isChanneling())
{
return;
}
if (_skill == null)
if (!isChanneling() || (_skill == null))
{
return;
}
try
{
if (_skill.getMpPerChanneling() > 0)