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

Sync with L2jServer HighFive Sep 18th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-09-19 22:37:08 +00:00
parent 339cab601b
commit a2d764aaf8
134 changed files with 1440 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
trunk/java/com/l2jserver/gameserver/model/skills/Skill.java
View File

@ -340,8 +340,8 @@ public final class Skill implements IIdentifiable
_nextActionIsAttack = set.getBoolean("nextActionAttack", false);
_removedOnAnyActionExceptMove = set.getBoolean("removedOnAnyActionExceptMove", false);
_removedOnDamage = set.getBoolean("removedOnDamage", false);
_removedOnAnyActionExceptMove = (_abnormalType == AbnormalType.INVINCIBILITY) || (_abnormalType == AbnormalType.HIDE);
_removedOnDamage = (_abnormalType == AbnormalType.SLEEP) || (_abnormalType == AbnormalType.FORCE_MEDITATION) || (_abnormalType == AbnormalType.HIDE);
_blockedInOlympiad = set.getBoolean("blockedInOlympiad", false);
@ -1400,7 +1400,7 @@ public final class Skill implements IIdentifiable
}
// Support for buff sharing feature including healing herbs.
if (effected.isPlayer() && effected.hasServitors() && !isTransformation())
if (effected.isPlayer() && effected.hasServitors() && !isTransformation() && (getAbnormalType() != AbnormalType.SUMMON_CONDITION))
{
if ((addContinuousEffects && isContinuous() && !isDebuff()) || isRecoveryHerb())
{

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

@ -92,7 +92,7 @@ public class SkillChannelizer implements Runnable
}
// Cancel the task and unset it.
_task.cancel(false);
_task.cancel(true);
_task = null;
// Cancel target channelization and unset it.
@ -126,7 +126,10 @@ public class SkillChannelizer implements Runnable
{
return;
}
if (_skill == null)
{
return;
}
try
{
if (_skill.getMpPerChanneling() > 0)