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

Sync with L2jServer HighFive Feb 18th 2015.

Browse Source
This commit is contained in:
mobius
2015-02-18 23:00:01 +00:00
parent 2bc6190412
commit d76ff9a69a
24 changed files with 105 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
trunk/java/com/l2jserver/gameserver/model/actor/L2Character.java
View File

@@ -1954,6 +1954,11 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
{
if (item.isEquipped())
{
if (item.getMana() < item.useSkillDisTime())
{
abortCast();
return;
}
item.decreaseMana(false, item.useSkillDisTime());
break;
}
@@ -5173,10 +5178,13 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
// Launch weapon Special ability effect if available
L2Weapon activeWeapon = getActiveWeaponItem();
if (activeWeapon != null)
if (crit)
{
activeWeapon.castOnCriticalSkill(this, target);
L2Weapon activeWeapon = getActiveWeaponItem();
if (activeWeapon != null)
{
activeWeapon.castOnCriticalSkill(this, target);
}
}
// Recharge any active auto-soulshot tasks for current creature.

15
trunk/java/com/l2jserver/gameserver/model/actor/stat/CharStat.java
View File

@@ -680,20 +680,7 @@ public class CharStat
return 1;
}
double mpConsume = calcStat(Stats.MP_CONSUME, skill.getMpInitialConsume(), null, skill);
if (skill.isDance())
{
return (int) calcStat(Stats.DANCE_MP_CONSUME_RATE, mpConsume);
}
else if (skill.isMagic())
{
return (int) calcStat(Stats.MAGICAL_MP_CONSUME_RATE, mpConsume);
}
else
{
return (int) calcStat(Stats.PHYSICAL_MP_CONSUME_RATE, mpConsume);
}
return (int) calcStat(Stats.MP_CONSUME, skill.getMpInitialConsume(), null, skill);
}
public byte getAttackElement()