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

Minor Creature class cleanup.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-01-06 22:20:04 +00:00
parent eb59d00dac
commit ff4e454f7c
25 changed files with 246 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -1765,9 +1765,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return;
}
// Get the Identifier of the skill
final int magicId = skill.getId();
// Get the Base Casting Time of the Skills.
int skillTime = (skill.getHitTime() + skill.getCoolTime());
if (!skill.isChanneling() || (skill.getChannelingSkillId() == 0))
@@ -1929,7 +1926,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (isPlayer() && !skill.isAbnormalInstant())
{
SystemMessage sm = null;
switch (magicId)
switch (skill.getId())
{
case 1312: // Fishing
{
@@ -5665,8 +5662,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
{
try
{
final Weapon activeWeapon = getActiveWeaponItem();
// Check if the toggle skill effects are already in progress on the Creature
if (skill.isToggle() && isAffectedBySkill(skill.getId()))
{
@@ -5719,6 +5714,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (!skill.isStatic())
{
// Launch weapon Special ability skill effect if available
final Weapon activeWeapon = getActiveWeaponItem();
if ((activeWeapon != null) && !target.isDead())
{
activeWeapon.castOnMagicSkill(this, target, skill);