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

30
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -976,13 +976,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
if (!isAlikeDead())
{
if ((isNpc() && target.isAlikeDead()) || !isInSurroundingRegion(target))
{
getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET);
return;
}
else if (isPlayer() && target.isDead())
if (((isNpc() && target.isAlikeDead()) || !isInSurroundingRegion(target)) || (isPlayer() && target.isDead()))
{
getAI().setIntention(AI_INTENTION_ACTIVE);
sendPacket(ActionFailed.STATIC_PACKET);
@@ -996,9 +990,6 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
}
}
// Get the active weapon item corresponding to the active weapon instance (always equipped in the right hand)
final Weapon weaponItem = getActiveWeaponItem();
final WeaponType weaponType = getAttackType();
if (getActingPlayer() != null)
{
if (getActingPlayer().inObserverMode())
@@ -1045,6 +1036,10 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
return;
}
// Get the active weapon item corresponding to the active weapon instance (always equipped in the right hand)
final Weapon weaponItem = getActiveWeaponItem();
final WeaponType weaponType = getAttackType();
// BOW and CROSSBOW checks
if (weaponItem != null)
{
@@ -3923,18 +3918,11 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
weapon.applyConditionalSkills(this, target, null, ItemSkillType.ON_CRITICAL_SKILL);
}
if (isPlayer() && !target.isHpBlocked())
// If hit by a cursed weapon, CP is reduced to 0.
// If a cursed weapon is hit by a Hero, CP is reduced to 0.
if (isPlayer() && !target.isHpBlocked() && (((Player) this).isCursedWeaponEquipped() || (((Player) this).isHero() && target.isPlayer() && target.getActingPlayer().isCursedWeaponEquipped())))
{
if (((Player) this).isCursedWeaponEquipped())
{
// If hit by a cursed weapon, CP is reduced to 0
target.setCurrentCp(0);
}
else if (((Player) this).isHero() && target.isPlayer() && target.getActingPlayer().isCursedWeaponEquipped())
{
// If a cursed weapon is hit by a Hero, CP is reduced to 0
target.setCurrentCp(0);
}
target.setCurrentCp(0);
}
}