From 859945e65956a1a2d418ec612d6452f8c99dbd10 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 15 Mar 2019 18:53:49 +0000 Subject: [PATCH] Adjustments for previous commit. --- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../effecthandlers/CreateCommonItem.java | 3 ++- .../handlers/effecthandlers/CreateItem.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/Crystallize.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../effecthandlers/RemoveEquipPenalty.java | 3 ++- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../effecthandlers/CreateCommonItem.java | 3 ++- .../handlers/effecthandlers/CreateItem.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/Crystallize.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../handlers/effecthandlers/DisableSkill.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/LimitSkill.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../effecthandlers/RemoveEquipPenalty.java | 3 ++- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../effecthandlers/TrackLimitedSkill.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../effecthandlers/CreateCommonItem.java | 3 ++- .../handlers/effecthandlers/CreateItem.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/Crystallize.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../handlers/effecthandlers/DisableSkill.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/LimitSkill.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../effecthandlers/RemoveEquipPenalty.java | 3 ++- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../effecthandlers/TrackLimitedSkill.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../effecthandlers/CreateCommonItem.java | 3 ++- .../handlers/effecthandlers/CreateItem.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/Crystallize.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../handlers/effecthandlers/DisableSkill.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/LimitSkill.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../effecthandlers/RemoveEquipPenalty.java | 3 ++- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../effecthandlers/TrackLimitedSkill.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- .../effecthandlers/AbnormalShield.java | 3 ++- .../handlers/effecthandlers/AbsorbDamage.java | 3 ++- .../AbstractConditionalHpEffect.java | 3 ++- .../handlers/effecthandlers/AttackTrait.java | 3 ++- .../handlers/effecthandlers/Betray.java | 3 ++- .../effecthandlers/BlockAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/BlockAction.java | 3 ++- .../handlers/effecthandlers/BlockActions.java | 3 ++- .../handlers/effecthandlers/BlockChat.java | 3 ++- .../handlers/effecthandlers/BlockMove.java | 3 ++- .../handlers/effecthandlers/BlockParty.java | 3 ++- .../handlers/effecthandlers/BlockSkill.java | 3 ++- .../handlers/effecthandlers/BlockTarget.java | 3 ++- .../effecthandlers/CallSkillOnActionTime.java | 5 +++-- .../effecthandlers/ChameleonRest.java | 5 +++-- .../handlers/effecthandlers/ChangeBody.java | 3 ++- .../CriticalDamagePosition.java | 3 ++- .../CriticalRatePositionBonus.java | 3 ++- .../effecthandlers/CrystalGradeModify.java | 3 ++- .../handlers/effecthandlers/DamOverTime.java | 5 +++-- .../effecthandlers/DamOverTimePercent.java | 3 ++- .../handlers/effecthandlers/DefenceTrait.java | 3 ++- .../effecthandlers/DisableTargeting.java | 3 ++- .../handlers/effecthandlers/DoubleCast.java | 5 +++-- .../handlers/effecthandlers/EnableCloak.java | 3 ++- .../effecthandlers/EnlargeAbnormalSlot.java | 3 ++- .../handlers/effecthandlers/FakeDeath.java | 5 +++-- .../effecthandlers/FatalBlowRate.java | 3 ++- .../scripts/handlers/effecthandlers/Fear.java | 5 +++-- .../scripts/handlers/effecthandlers/Flag.java | 3 ++- .../handlers/effecthandlers/GetMomentum.java | 3 ++- .../scripts/handlers/effecthandlers/Grow.java | 3 ++- .../scripts/handlers/effecthandlers/Hide.java | 3 ++- .../handlers/effecthandlers/HitAtNight.java | 3 ++- .../handlers/effecthandlers/HpToOwner.java | 5 +++-- .../effecthandlers/ImmobilePetBuff.java | 3 ++- .../handlers/effecthandlers/MagicMpCost.java | 3 ++- .../effecthandlers/MagicalDamOverTime.java | 3 ++- .../effecthandlers/ManaDamOverTime.java | 3 ++- .../effecthandlers/MpConsumePerLevel.java | 3 ++- .../scripts/handlers/effecthandlers/Mute.java | 3 ++- .../effecthandlers/PhysicalAttackMute.java | 3 ++- .../handlers/effecthandlers/PhysicalMute.java | 3 ++- .../effecthandlers/PolearmSingleTarget.java | 3 ++- .../RecoverVitalityInPeaceZone.java | 3 ++- .../handlers/effecthandlers/ReduceDamage.java | 3 ++- .../handlers/effecthandlers/Relax.java | 5 +++-- .../handlers/effecthandlers/ResistSkill.java | 3 ++- .../handlers/effecthandlers/Reuse.java | 3 ++- .../scripts/handlers/effecthandlers/Root.java | 3 ++- .../handlers/effecthandlers/SkillEvasion.java | 3 ++- .../effecthandlers/SkillTurningOverTime.java | 5 +++-- .../handlers/effecthandlers/SoulEating.java | 3 ++- .../effecthandlers/SphericBarrier.java | 3 ++- .../effecthandlers/StatByMoveType.java | 5 +++-- .../handlers/effecthandlers/Synergy.java | 3 ++- .../handlers/effecthandlers/TalismanSlot.java | 3 ++- .../handlers/effecthandlers/TargetMe.java | 3 ++- .../TransferDamageToPlayer.java | 3 ++- .../effecthandlers/Transformation.java | 3 ++- .../effecthandlers/TriggerSkillByAttack.java | 3 ++- .../effecthandlers/TriggerSkillByAvoid.java | 3 ++- .../effecthandlers/TriggerSkillByDamage.java | 3 ++- .../TriggerSkillByDeathBlow.java | 3 ++- .../effecthandlers/TriggerSkillByKill.java | 3 ++- .../TriggerSkillByMagicType.java | 3 ++- .../effecthandlers/TriggerSkillBySkill.java | 3 ++- .../TriggerSkillBySkillAttack.java | 3 ++- .../handlers/effecthandlers/Untargetable.java | 3 ++- .../model/effects/AbstractEffect.java | 22 ++----------------- 795 files changed, 1700 insertions(+), 1114 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 717406c0c2..122fd58a5e 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_grade); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 717406c0c2..122fd58a5e 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_grade); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 717406c0c2..122fd58a5e 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_grade); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 3e2ec29712..a9ce28f735 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateCommonItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 4be551bec0..da71d8dda1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index ca64a7d8f6..291bd947f2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_amount); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 1900e6fe76..1d1e61c17b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -43,7 +44,7 @@ public final class Crystallize extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 91cb6d7b39..4e2b17e614 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.CrystalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -43,7 +44,7 @@ public final class RemoveEquipPenalty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 3e2ec29712..a9ce28f735 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateCommonItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 4be551bec0..da71d8dda1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index ca64a7d8f6..291bd947f2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_amount); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 1900e6fe76..1d1e61c17b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -43,7 +44,7 @@ public final class Crystallize extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 069ae71558..aa7d50b997 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,6 +23,7 @@ import java.util.Set; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -51,7 +52,7 @@ public class DisableSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (int disableSkillId : disableSkills) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 9f17aeaa5d..e7a9a81791 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -42,7 +43,7 @@ public class LimitSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (skill.getId()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 91cb6d7b39..4e2b17e614 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.CrystalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -43,7 +44,7 @@ public final class RemoveEquipPenalty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 6a4e573fe1..ef66dc2ba4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -47,7 +48,7 @@ public class TrackLimitedSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { trackAeoreLimit(effector, effected, skill, LIMIT_OF_AEORE); // Tracking Aeore Limit Debuff trackSigelLimit(effector, effected, skill, LIMIT_OF_SIGEL); // Tracking Sigel Limit Debuff diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 3e2ec29712..a9ce28f735 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateCommonItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 4be551bec0..da71d8dda1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index ca64a7d8f6..291bd947f2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_amount); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 1900e6fe76..1d1e61c17b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -43,7 +44,7 @@ public final class Crystallize extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 069ae71558..aa7d50b997 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,6 +23,7 @@ import java.util.Set; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -51,7 +52,7 @@ public class DisableSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (int disableSkillId : disableSkills) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 9f17aeaa5d..e7a9a81791 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -42,7 +43,7 @@ public class LimitSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (skill.getId()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 91cb6d7b39..4e2b17e614 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.CrystalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -43,7 +44,7 @@ public final class RemoveEquipPenalty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 6a4e573fe1..ef66dc2ba4 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -47,7 +48,7 @@ public class TrackLimitedSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { trackAeoreLimit(effector, effected, skill, LIMIT_OF_AEORE); // Tracking Aeore Limit Debuff trackSigelLimit(effector, effected, skill, LIMIT_OF_SIGEL); // Tracking Sigel Limit Debuff diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java index 3e2ec29712..a9ce28f735 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateCommonItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateCommonItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java index 4be551bec0..da71d8dda1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CreateItem.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CreateItem extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index ca64a7d8f6..291bd947f2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_amount); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java index 1900e6fe76..1d1e61c17b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Crystallize.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -43,7 +44,7 @@ public final class Crystallize extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 069ae71558..aa7d50b997 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -23,6 +23,7 @@ import java.util.Set; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -51,7 +52,7 @@ public class DisableSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (int disableSkillId : disableSkills) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java index 9f17aeaa5d..e7a9a81791 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/LimitSkill.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -42,7 +43,7 @@ public class LimitSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (skill.getId()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java index 91cb6d7b39..4e2b17e614 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RemoveEquipPenalty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.CrystalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -43,7 +44,7 @@ public final class RemoveEquipPenalty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2PcInstance player = effected.getActingPlayer(); if (player != null) diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java index 6a4e573fe1..ef66dc2ba4 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -47,7 +48,7 @@ public class TrackLimitedSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { trackAeoreLimit(effector, effected, skill, LIMIT_OF_AEORE); // Tracking Aeore Limit Debuff trackSigelLimit(effector, effected, skill, LIMIT_OF_SIGEL); // Tracking Sigel Limit Debuff diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 717406c0c2..122fd58a5e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_grade); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 717406c0c2..122fd58a5e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_grade); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 717406c0c2..122fd58a5e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_grade); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java index 33ddc02a86..5f3e43b964 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbnormalShield.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public final class AbnormalShield extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setAbnormalShieldBlocks(_times); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java index e9c88553fe..8f25a49888 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbsorbDamage.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -68,7 +69,7 @@ public class AbsorbDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _damageHolder.put(effected.getObjectId(), _damage); effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java index 4b39fe8315..82bd6c1d13 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AbstractConditionalHpEffect.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.ListenersContainer; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureHpChange; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -44,7 +45,7 @@ abstract class AbstractConditionalHpEffect extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Augmentation option if (skill == null) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java index d74fd3a648..fa6a9fdc8a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/AttackTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -69,7 +70,7 @@ public final class AttackTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getAttackTraits()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java index a7e0626ef3..1d90de2b2f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Betray.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Betray extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().setIntention(CtrlIntention.AI_INTENTION_ATTACK, effected.getActingPlayer()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java index 143ff0cb20..dd4ecc7fcb 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAbnormalSlot.java @@ -23,6 +23,7 @@ import java.util.stream.Collectors; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; @@ -40,7 +41,7 @@ public final class BlockAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().addBlockedAbnormalTypes(_blockAbnormalSlots); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java index a722b8f0bd..0a931e8502 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockAction.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -59,7 +60,7 @@ public final class BlockAction extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (_blockedActions.contains(BotReportTable.PARTY_ACTION_BLOCK_ID)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java index bc3a1e7227..f56ca977e6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public final class BlockActions extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { _allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill); effected.startParalyze(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java index 89c3e54971..51da42bfe4 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockChat.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -49,7 +50,7 @@ public final class BlockChat extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.CHAT_BAN, 0, "Chat banned bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java index a58ad8b1f4..e2675413b0 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockMove.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class BlockMove extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setIsImmobilized(true); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java index e49dc6c64b..cec9546a54 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockParty.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.instancemanager.PunishmentManager; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.punishment.PunishmentAffect; import com.l2jmobius.gameserver.model.punishment.PunishmentTask; import com.l2jmobius.gameserver.model.punishment.PunishmentType; @@ -42,7 +43,7 @@ public final class BlockParty extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { PunishmentManager.getInstance().startPunishment(new PunishmentTask(0, effected.getObjectId(), PunishmentAffect.CHARACTER, PunishmentType.PARTY_BAN, 0, "Party banned by bot report", "system", true)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java index e2ac63e41a..459e0042aa 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockSkill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillUse; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.TerminateReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -50,7 +51,7 @@ public final class BlockSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_magicTypes == null) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java index 2cb9267e0e..0491335484 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockTarget.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.L2World; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public class BlockTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTargetable(false); L2World.getInstance().forEachVisibleObject(effected, L2Character.class, target -> diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java index 7b786a90d4..4b62bbf671 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CallSkillOnActionTime.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -41,7 +42,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getEffectList().stopEffects(Collections.singleton(_skill.getSkill().getAbnormalType())); effected.getEffectList().addBlockedAbnormalTypes(Collections.singleton(_skill.getSkill().getAbnormalType())); @@ -54,7 +55,7 @@ public final class CallSkillOnActionTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java index 8be7f869c6..db4ac0dd28 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChameleonRest.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -78,7 +79,7 @@ public final class ChameleonRest extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java index 405b767faf..024be7af8f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ChangeBody.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.TemplateChanceHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -49,7 +50,7 @@ public final class ChangeBody extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final int chance = Rnd.get(100); //@formatter:off diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java index 528ff2d5f8..c49892dcbd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalDamagePosition.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalDamagePosition extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_DAMAGE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java index 24e0d93502..222f978c71 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CriticalRatePositionBonus.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.util.MathUtil; @@ -39,7 +40,7 @@ public class CriticalRatePositionBonus extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergePositionTypeValue(Stats.CRITICAL_RATE, _position, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java index 717406c0c2..122fd58a5e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class CrystalGradeModify extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().setExpertisePenaltyBonus(_grade); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java index 07759f9e7d..076bc4895c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -40,7 +41,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -67,7 +68,7 @@ public final class DamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java index 044b4d98bc..d11de68630 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DamOverTimePercent.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class DamOverTimePercent extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java index 9b3af7d06a..abd4b120b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DefenceTrait.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.CharStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.TraitType; @@ -98,7 +99,7 @@ public final class DefenceTrait extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final CharStat charStat = effected.getStat(); synchronized (charStat.getDefenceTraits()) diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java index 47b88b47d1..ae632c10b9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DisableTargeting.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -34,7 +35,7 @@ public final class DisableTargeting extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.setTarget(null); effected.abortAttack(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java index 09a0f9b300..8cf3894e35 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/DoubleCast.java @@ -26,6 +26,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class DoubleCast extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -70,7 +71,7 @@ public final class DoubleCast extends AbstractEffect } } } - super.onStart(effector, effected, skill); + super.onStart(effector, effected, skill, item); } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java index 640bf5f0d9..df804e54f1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnableCloak.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class EnableCloak extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().setCloakSlotStatus(true); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java index 2c1012dbb1..1ded81a1c9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnlargeAbnormalSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class EnlargeAbnormalSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().setMaxBuffCount(effected.getStat().getMaxBuffCount() + _slots); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java index 66817daf19..e355bb57e5 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FakeDeath.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; import com.l2jmobius.gameserver.network.serverpackets.ChangeWaitType; @@ -46,7 +47,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { @@ -81,7 +82,7 @@ public final class FakeDeath extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startFakeDeath(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java index 2f32279761..fe475ff54f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/FatalBlowRate.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.enums.StatModifierType; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -38,7 +39,7 @@ public class FatalBlowRate extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { switch (_mode) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java index 8de677a910..0b7b8711a3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Fear.java @@ -28,6 +28,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2FortCommanderInstance; import com.l2jmobius.gameserver.model.actor.instance.L2SiegeFlagInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.Util; @@ -66,14 +67,14 @@ public final class Fear extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { fearAction(null, effected); return false; } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_AFRAID); fearAction(effector, effected); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java index 85a7701506..f88201fc86 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Flag.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -38,7 +39,7 @@ public final class Flag extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.updatePvPFlag(1); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java index 8f91f4b961..f46c811737 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/GetMomentum.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -45,7 +46,7 @@ public class GetMomentum extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java index 4eb28677e3..13ace2fb77 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Grow.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Npc; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -32,7 +33,7 @@ public final class Grow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isNpc()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java index 1f71330b6e..ff6e1c2c41 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Hide.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -35,7 +36,7 @@ public final class Hide extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java index 2f5648e914..741b93c098 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HitAtNight.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -33,7 +34,7 @@ public class HitAtNight extends AbstractStatEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { GameTimeController.getInstance().addShadowSenseCharacter(effected); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java index 853236001c..d8fced33c3 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/HpToOwner.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -40,7 +41,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!skill.isToggle() && skill.isMagic()) { @@ -61,7 +62,7 @@ public final class HpToOwner extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java index c7e7969777..49d9064b06 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ImmobilePetBuff.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Summon; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class ImmobilePetBuff extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isSummon() && effector.isPlayer() && (((L2Summon) effected).getOwner() == effector)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java index 2257568088..f4df105c7d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicMpCost.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class MagicMpCost extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMpConsumeTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java index bebbaefdca..f36df5b923 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MagicalDamOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -47,7 +48,7 @@ public final class MagicalDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { final L2Character activeChar = effector; final L2Character target = effected; diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java index 6405a3a837..449656fd16 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ManaDamOverTime.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class ManaDamOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java index 3f1d4e464c..682bae9071 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/MpConsumePerLevel.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -36,7 +37,7 @@ public final class MpConsumePerLevel extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java index 16109cdebd..62bb12ab47 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Mute.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -46,7 +47,7 @@ public final class Mute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.abortCast(); effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java index 05b013f575..4198837596 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackMute.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -39,7 +40,7 @@ public final class PhysicalAttackMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.startPhysicalAttackMuted(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java index 5ef97b53e1..96c29411ad 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalMute.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class PhysicalMute extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getAI().notifyEvent(CtrlEvent.EVT_MUTED); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java index 831e5d3cf0..552b3e0842 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PolearmSingleTarget.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -32,7 +33,7 @@ public class PolearmSingleTarget extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java index 9438b97eaa..06ad3c9590 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RecoverVitalityInPeaceZone.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.stat.PcStat; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -46,7 +47,7 @@ public final class RecoverVitalityInPeaceZone extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) // || effected.isDead() // diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java index 335eb252de..b7c330baa1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ReduceDamage.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -57,7 +58,7 @@ public class ReduceDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java index f802e0574c..88fc7ec09f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Relax.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -51,7 +52,7 @@ public final class Relax extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { @@ -64,7 +65,7 @@ public final class Relax extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java index a85a91b2f3..e2687ab797 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResistSkill.java @@ -23,6 +23,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -53,7 +54,7 @@ public final class ResistSkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { for (SkillHolder holder : _skills) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java index f6a664f009..43df23c21f 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Reuse.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.util.MathUtil; @@ -37,7 +38,7 @@ public class Reuse extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeReuseTypeValue(_magicType, (_amount / 100) + 1, MathUtil::mul); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java index 76983697aa..e73d6ab674 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Root.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; import com.l2jmobius.gameserver.model.effects.L2EffectType; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -56,7 +57,7 @@ public final class Root extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.stopMove(null); effected.getAI().notifyEvent(CtrlEvent.EVT_ROOTED); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java index eaa75cd64c..da4c896e51 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillEvasion.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -37,7 +38,7 @@ public class SkillEvasion extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().addSkillEvasionTypeValue(_magicType, _amount); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java index 10a6a085c4..75d5b35834 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SkillTurningOverTime.java @@ -20,6 +20,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Formulas; @@ -39,7 +40,7 @@ public final class SkillTurningOverTime extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((effected == null) || (effected == effector) || effected.isRaid()) { @@ -52,6 +53,6 @@ public final class SkillTurningOverTime extends AbstractEffect effected.breakCast(); } - return super.onActionTime(effector, effected, skill); + return super.onActionTime(effector, effected, skill, item); } } \ No newline at end of file diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java index 554137c24f..b2f08a03c1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SoulEating.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayableExpChanged; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; import com.l2jmobius.gameserver.network.SystemMessageId; @@ -46,7 +47,7 @@ public final class SoulEating extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java index 7f5af9425c..2f3833c2ec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/SphericBarrier.java @@ -22,6 +22,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.FunctionEventListener; import com.l2jmobius.gameserver.model.events.returns.DamageReturn; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -36,7 +37,7 @@ public class SphericBarrier extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new FunctionEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java index beffb920fe..41fa65f90b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/StatByMoveType.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.MoveType; import com.l2jmobius.gameserver.model.stats.Stats; @@ -41,7 +42,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getStat().mergeMoveTypeValue(_stat, _type, _value); } @@ -53,7 +54,7 @@ public class StatByMoveType extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { return skill.isPassive() || skill.isToggle(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java index 8d18d6fecc..4db9a1eec2 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Synergy.java @@ -25,6 +25,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -77,7 +78,7 @@ public final class Synergy extends AbstractEffect } @Override - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) + public boolean onActionTime(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effector.isDead()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java index c4f2ef9e0c..dca6f872a6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TalismanSlot.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -41,7 +42,7 @@ public final class TalismanSlot extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.getActingPlayer().getStat().addTalismanSlots(_slots); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java index 0f06888ace..db1fc3f701 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TargetMe.java @@ -20,6 +20,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -42,7 +43,7 @@ public final class TargetMe extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java index e9e47242d7..0f456645c7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TransferDamageToPlayer.java @@ -19,6 +19,7 @@ package handlers.effecthandlers; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.actor.L2Playable; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.stats.Stats; @@ -43,7 +44,7 @@ public final class TransferDamageToPlayer extends AbstractStatAddEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (effected.isPlayable() && effector.isPlayer()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java index 92df00cb49..8f7c9eca47 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Transformation.java @@ -24,6 +24,7 @@ import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -58,7 +59,7 @@ public final class Transformation extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if (!_id.isEmpty()) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java index 6a3fa59f3b..8f17c6c76c 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAttack.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.items.type.WeaponType; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; @@ -166,7 +167,7 @@ public final class TriggerSkillByAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java index be6ee2c31e..7557f4a51d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByAvoid.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureAttackAvoid; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -96,7 +97,7 @@ public final class TriggerSkillByAvoid extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_ATTACK_AVOID, (OnCreatureAttackAvoid event) -> onAvoidEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java index dc65a5f594..4a889ce4ff 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDamage.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -104,7 +105,7 @@ public final class TriggerSkillByDamage extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java index df20e39d84..4010af5cec 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByDeathBlow.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageReceived; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; import com.l2jmobius.gameserver.model.skills.targets.TargetType; @@ -107,7 +108,7 @@ public final class TriggerSkillByDeathBlow extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_RECEIVED, (OnCreatureDamageReceived event) -> onDamageReceivedEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java index cb795007f3..ce0b319cdd 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByKill.java @@ -24,6 +24,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureKilled; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -69,7 +70,7 @@ public final class TriggerSkillByKill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_KILLED, (OnCreatureKilled event) -> onCreatureKilled(event, effected), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java index fa1871f623..3b8f360b7a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillByMagicType.java @@ -30,6 +30,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -112,7 +113,7 @@ public final class TriggerSkillByMagicType extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { if ((_chance == 0) || (_skill.getSkillId() == 0) || (_skill.getSkillLevel() == 0) || (_magicTypes.length == 0)) { diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java index 014142ca85..847c1ec3cf 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkill.java @@ -29,6 +29,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureSkillFinishCast; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -56,7 +57,7 @@ public final class TriggerSkillBySkill extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_SKILL_FINISH_CAST, (OnCreatureSkillFinishCast event) -> onSkillUseEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java index 1f0c32d50d..4f5562f2f7 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/TriggerSkillBySkillAttack.java @@ -31,6 +31,7 @@ import com.l2jmobius.gameserver.model.events.EventType; import com.l2jmobius.gameserver.model.events.impl.character.OnCreatureDamageDealt; import com.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.BuffInfo; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.skills.SkillCaster; @@ -66,7 +67,7 @@ public final class TriggerSkillBySkillAttack extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { effected.addListener(new ConsumerEventListener(effected, EventType.ON_CREATURE_DAMAGE_DEALT, (OnCreatureDamageDealt event) -> onAttackEvent(event), this)); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java index ed1350c021..f8f95f1372 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/Untargetable.java @@ -21,6 +21,7 @@ import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.actor.L2Character; import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.EffectFlag; +import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance; import com.l2jmobius.gameserver.model.skills.Skill; /** @@ -40,7 +41,7 @@ public final class Untargetable extends AbstractEffect } @Override - public void onStart(L2Character effector, L2Character effected, Skill skill) + public void onStart(L2Character effector, L2Character effected, Skill skill, L2ItemInstance item) { // Remove target from those that have the untargetable creature on target. L2World.getInstance().forEachVisibleObject(effected, L2Character.class, c -> diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java index 66dfeaf025..831fc1821b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/effects/AbstractEffect.java @@ -26,8 +26,8 @@ import com.l2jmobius.gameserver.model.skills.Skill; /** * Abstract effect implementation.
* Instant effects should not override {@link #onExit(L2Character, L2Character, Skill)}.
- * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill)}.
- * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill)} nor {@link #onExit(L2Character, L2Character, Skill)}. + * Instant effects should not override {@link #canStart(L2Character, L2Character, Skill)}, all checks should be done {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)}.
+ * Do not call super class methods {@link #onStart(L2Character, L2Character, Skill, L2ItemInstance)} nor {@link #onExit(L2Character, L2Character, Skill)}. * @author Zoey76 */ public abstract class AbstractEffect @@ -102,11 +102,6 @@ public abstract class AbstractEffect } - public void onStart(L2Character effector, L2Character effected, Skill skill) - { - onStart(effector, effected, skill, null); - } - public void onExit(L2Character effector, L2Character effected, Skill skill) { @@ -126,19 +121,6 @@ public abstract class AbstractEffect return false; } - /** - * Called on each tick.
- * If the abnormal time is lesser than zero it will last forever. - * @param effector - * @param effected - * @param skill - * @return if {@code true} this effect will continue forever, if {@code false} it will stop after abnormal time has passed - */ - public boolean onActionTime(L2Character effector, L2Character effected, Skill skill) - { - return onActionTime(effector, effected, skill, null); - } - /** * Get the effect flags. * @return bit flag for current effect