diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java index f167824f68..a176c5b792 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java @@ -151,7 +151,7 @@ public class Q365_DevilsLegacy extends Quest final Skill skill = SkillTable.getInstance().getSkill(4082, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { - skill.getEffects(npc, player); + skill.applyEffects(npc, player); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index ad371523f7..592312bf2e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -236,7 +236,7 @@ public class Q421_LittleWingsBigAdventure extends Quest final Skill skill = SkillTable.getInstance().getSkill(4167, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { - skill.getEffects(npc, player); + skill.applyEffects(npc, player); } } break; @@ -312,7 +312,7 @@ public class Q421_LittleWingsBigAdventure extends Quest final Skill skill = SkillTable.getInstance().getSkill(4243, 1); if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) { - skill.getEffects(npc, originalKiller); + skill.applyEffects(npc, originalKiller); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index 1b7c8aee11..52298d16ad 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -169,7 +169,7 @@ public class Q501_ProofOfClanAlliance extends Quest st.takeItems(SYMBOL_OF_LOYALTY, 1); st.takeItems(SYMBOL_OF_LOYALTY, 1); st.giveItems(ANTIDOTE_RECIPE_LIST, 1); - SkillTable.getInstance().getSkill(4082, 1).getEffects(npc, player); + SkillTable.getInstance().getSkill(4082, 1).applyEffects(npc, player); startQuestTimer("poison", 60000, npc, player, true); st.playSound(QuestState.SOUND_MIDDLE); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java index bcbf6845ac..62b30da00c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java @@ -87,7 +87,7 @@ public class EnergyStone implements IItemHandler final Skill dummy = SkillTable.getInstance().getSkill(skill.getId(), skill.getLevel()); if (dummy != null) { - dummy.getEffects(player, player); + dummy.applyEffects(player, player); player.sendPacket(new MagicSkillUse(playable, player, skill.getId(), 1, 1, 0)); player.destroyItemWithoutTrace("Consume", item.getObjectId(), 1, null, false); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java index be4c185bc3..66c423b33e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java @@ -113,7 +113,7 @@ public class Blow implements ISkillHandler target.stopSkillEffects(skill.getId()); if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill); target.sendPacket(sm); @@ -272,7 +272,7 @@ public class Blow implements ISkillHandler { effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java index 5180290250..681fe620c3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java @@ -46,7 +46,7 @@ public class Charge implements ISkillHandler continue; } final PlayerInstance target = (PlayerInstance) target1; - skill.getEffects(creature, target, false, false, false); + skill.applyEffects(creature, target, false, false, false); } // self Effect :] @@ -56,7 +56,7 @@ public class Charge implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } @Override diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java index 1eb6d7c2b3..d0b17db217 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java @@ -78,7 +78,7 @@ public class ClanGate implements ISkillHandler { effect.exit(false); } - skill.getEffectsSelf(player); + skill.applySelfEffects(player); } private class RemoveClanGate implements Runnable diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java index 3cb15811a8..bef4df152e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java @@ -217,7 +217,7 @@ public class Continuous implements ISkillHandler continue; } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); if (skill.getSkillType() == SkillType.AGGDEBUFF) { @@ -263,7 +263,7 @@ public class Continuous implements ISkillHandler } } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } @Override diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java index 10b4d5f8d8..f4a30cbc10 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java @@ -88,7 +88,7 @@ public class CpDam implements ISkillHandler target.breakAttack(); target.breakCast(); } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); creature.sendDamageMessage(target, damage, false, false, false); target.setCurrentCp(target.getCurrentCp() - damage); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java index 5be7b70b2d..75b773625f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java @@ -105,7 +105,7 @@ public class Disablers implements ISkillHandler { if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else { @@ -119,7 +119,7 @@ public class Disablers implements ISkillHandler case FAKE_DEATH: { // stun/fakedeath is not mdef dependant, it depends on lvl difference, target CON and power of stun - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); break; } case STUN: @@ -145,7 +145,7 @@ public class Disablers implements ISkillHandler } if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -165,7 +165,7 @@ public class Disablers implements ISkillHandler } if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -185,7 +185,7 @@ public class Disablers implements ISkillHandler } if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -209,7 +209,7 @@ public class Disablers implements ISkillHandler e.exit(false); } } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -224,7 +224,7 @@ public class Disablers implements ISkillHandler target.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, creature, (int) ((150 * skill.getPower()) / (target.getLevel() + 7))); } // TODO [Nemesiss] should this have 100% chance? - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); break; } case AGGREDUCE: @@ -232,7 +232,7 @@ public class Disablers implements ISkillHandler // these skills needs to be rechecked if (target instanceof Attackable) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); final double aggdiff = ((Attackable) target).getHating(creature) - target.calcStat(Stat.AGGRESSION, ((Attackable) target).getHating(creature), target, skill); if (skill.getPower() > 0) { @@ -263,7 +263,7 @@ public class Disablers implements ISkillHandler attackable.setWalking(); } } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { @@ -279,7 +279,7 @@ public class Disablers implements ISkillHandler targ.setWalking(); } } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -754,7 +754,7 @@ public class Disablers implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } private void negateEffect(Creature target, SkillType type, double power) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java index 8452ae1cec..7b12ce2839 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java @@ -92,7 +92,7 @@ public class Mdam implements ISkillHandler if (target.reflectSkill(skill)) { creature.stopSkillEffects(skill.getId()); - skill.getEffects(null, creature, false, sps, bss); + skill.applyEffects(null, creature, false, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill.getId()); creature.sendPacket(sm); @@ -101,7 +101,7 @@ public class Mdam implements ISkillHandler { // Like L2OFF must remove the first effect only if the second effect is successful target.stopSkillEffects(skill.getId()); - skill.getEffects(creature, target, false, sps, bss); + skill.applyEffects(creature, target, false, sps, bss); } else { @@ -132,7 +132,7 @@ public class Mdam implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); if (skill.isSuicideAttack()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index 7e9bc2b00f..fa6b36a54d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -150,7 +150,7 @@ public class Pdam implements ISkillHandler { creature.stopSkillEffects(skill.getId()); - skill.getEffects(null, creature, ss, sps, bss); + skill.applyEffects(null, creature, ss, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill.getId()); creature.sendPacket(sm); @@ -158,7 +158,7 @@ public class Pdam implements ISkillHandler else if (f.calcSkillSuccess(creature, target, skill, soul, false, false)) // activate attacked effects, if any { // Like L2OFF must remove the first effect if the second effect lands - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill.getId()); target.sendPacket(sm); @@ -307,12 +307,12 @@ public class Pdam implements ISkillHandler else if (skill.getId() == 345) // Sonic Rage { final Skill dummy = SkillTable.getInstance().getSkill(8, 7); // Lv7 Sonic Focus - dummy.getEffects(creature, creature, ss, sps, bss); + dummy.applyEffects(creature, creature, ss, sps, bss); } else if (skill.getId() == 346) // Raging Force { final Skill dummy = SkillTable.getInstance().getSkill(50, 7); // Lv7 Focused Force - dummy.getEffects(creature, creature, ss, sps, bss); + dummy.applyEffects(creature, creature, ss, sps, bss); } } // self Effect :] @@ -322,7 +322,7 @@ public class Pdam implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } if (skill.isMagic()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java index 822b340a22..0e480c172c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java @@ -168,7 +168,7 @@ public class Wedding implements IVoicedCommandHandler final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); if (activeChar.getFirstEffect(skill) == null) { - skill.getEffects(activeChar, activeChar, false, false, false); + skill.applyEffects(activeChar, activeChar, false, false, false); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skillId); activeChar.sendPacket(sm); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java index ef994f7db3..73dc8f89a9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java @@ -61,7 +61,7 @@ public class ForceBuff final Skill force = SkillTable.getInstance().getSkill(_forceId, _forceLevel); if (force != null) { - force.getEffects(_caster, _target, false, false, false); + force.applyEffects(_caster, _target, false, false, false); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java index 85a0bb162f..5c1c206d15 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java @@ -2648,12 +2648,12 @@ public abstract class Skill return (_effectTemplates != null) && (_effectTemplates.length > 0); } - public Effect[] getEffects(Creature effector, Creature effected) + public Effect[] applyEffects(Creature effector, Creature effected) { - return getEffects(effector, effected, false, false, false); + return applyEffects(effector, effected, false, false, false); } - public Effect[] getEffects(Creature effector, Creature effected, boolean ss, boolean sps, boolean bss) + public Effect[] applyEffects(Creature effector, Creature effected, boolean ss, boolean sps, boolean bss) { if (isPassive()) { @@ -2714,7 +2714,7 @@ public abstract class Skill return effects.toArray(new Effect[effects.size()]); } - public Effect[] getEffectsSelf(Creature effector) + public Effect[] applySelfEffects(Creature effector) { if (isPassive()) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index afc5c5276a..2e35ce23bb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -6141,7 +6141,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder abortAttack(); abortCast(); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - skill.getEffects(target, this, false, false, false); + skill.applyEffects(target, this, false, false, false); if (this instanceof Summon) { final Summon src = ((Summon) this); @@ -6150,7 +6150,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder src.getOwner().abortAttack(); src.getOwner().abortCast(); src.getOwner().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - skill.getEffects(target, src.getOwner(), false, false, false); + skill.applyEffects(target, src.getOwner(), false, false, false); } } } @@ -7894,7 +7894,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder abortAttack(); abortCast(); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - tempSkill.getEffects(creature, this, false, false, false); + tempSkill.applyEffects(creature, this, false, false, false); if (this instanceof Summon) { final Summon src = ((Summon) this); @@ -7903,7 +7903,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder src.getOwner().abortAttack(); src.getOwner().abortCast(); src.getOwner().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - tempSkill.getEffects(creature, src.getOwner(), false, false, false); + tempSkill.applyEffects(creature, src.getOwner(), false, false, false); } } } @@ -7917,7 +7917,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder final Skill tempSkill = SkillTable.getInstance().getSkill(4515, 1); if (tempSkill != null) { - tempSkill.getEffects(creature, this, false, false, false); + tempSkill.applyEffects(creature, this, false, false, false); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java index f4ce7ac652..b51efab696 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java @@ -161,7 +161,7 @@ public class CabaleBufferInstance extends NpcInstance final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); if (player.getFirstEffect(skill) == null) { - skill.getEffects(_caster, player, false, false, false); + skill.applyEffects(_caster, player, false, false, false); broadcastPacket(new MagicSkillUse(_caster, player, skill.getId(), skillLevel, skill.getHitTime(), 0)); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skillId); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java index e01b2b59d3..3ebaa2c617 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java @@ -212,7 +212,7 @@ public class ChestInstance extends MonsterInstance final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); if (creature.getFirstEffect(skill) == null) { - skill.getEffects(this, creature, false, false, false); + skill.applyEffects(this, creature, false, false, false); broadcastPacket(new MagicSkillUse(this, creature, skill.getId(), skillLevel, skill.getHitTime(), 0)); return true; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java index 74f10a47ea..45528ca6a1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java @@ -632,7 +632,7 @@ public class CubicInstance } } - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } } @@ -685,7 +685,7 @@ public class CubicInstance } if (Formulas.calcCubicSkillSuccess(activeCubic, target, skill)) { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } } @@ -716,7 +716,7 @@ public class CubicInstance { if (Formulas.calcCubicSkillSuccess(activeCubic, target, skill)) { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } break; } @@ -724,7 +724,7 @@ public class CubicInstance { if (Formulas.calcCubicSkillSuccess(activeCubic, target, skill)) { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } break; } @@ -755,7 +755,7 @@ public class CubicInstance { if (Formulas.calcCubicSkillSuccess(activeCubic, target, skill)) { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } break; } @@ -767,7 +767,7 @@ public class CubicInstance { target.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, activeCubic.getOwner(), (int) ((150 * skill.getPower()) / (target.getLevel() + 7))); } - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } break; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index d0193e77f5..04a9c5396a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -1930,7 +1930,7 @@ public class NpcInstance extends Creature if (skill != null) { broadcastPacket(new MagicSkillUse(this, player, skill.getId(), skill.getLevel(), 0, 0)); - skill.getEffects(this, player); + skill.applyEffects(this, player); } player.setCurrentCp(player.getMaxCp()); @@ -2003,7 +2003,7 @@ public class NpcInstance extends Creature else { broadcastPacket(new MagicSkillUse(this, player, skill.getId(), skill.getLevel(), 0, 0)); - skill.getEffects(this, player); + skill.applyEffects(this, player); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 297768df40..893b1eb157 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2876,7 +2876,7 @@ public class PlayerInstance extends Playable { // stop old toggle skill effect, and give new toggle skill effect back toggleEffect.exit(false); - sk.getEffects(this, this, false, false, false); + sk.applyEffects(this, this, false, false, false); } } @@ -9095,7 +9095,7 @@ public class PlayerInstance extends Playable if (activateEffects) { final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); - skill.getEffects(this, this, false, false, false); + skill.applyEffects(this, this, false, false, false); for (Effect effect : getAllEffects()) { if (effect.getSkill().getId() == skillId) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java index 4bb7d8b5c1..0c6ae8e45b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java @@ -82,7 +82,7 @@ public class ProtectorInstance extends NpcInstance if (player.getFirstEffect(skill) == null) { final int objId = _caster.getObjectId(); - skill.getEffects(_caster, player, false, false, false); + skill.applyEffects(_caster, player, false, false, false); broadcastPacket(new MagicSkillUse(_caster, player, skillId, skillLevel, Config.PROTECTOR_SKILLTIME, 0)); broadcastPacket(new CreatureSay(objId, ChatType.GENERAL, getName(), Config.PROTECTOR_MESSAGE)); return true; @@ -103,7 +103,7 @@ public class ProtectorInstance extends NpcInstance if (player.getFirstEffect(skill) == null) { final int objId = _caster.getObjectId(); - skill.getEffects(_caster, player, false, false, false); + skill.applyEffects(_caster, player, false, false, false); broadcastPacket(new MagicSkillUse(_caster, player, skillId, skillLevel, Config.PROTECTOR_SKILLTIME, 0)); broadcastPacket(new CreatureSay(objId, ChatType.GENERAL, getName(), Config.PROTECTOR_MESSAGE)); return true; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index b2ad2ef053..e27985de84 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -116,7 +116,7 @@ public class SchemeBufferInstance extends FolkInstance { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - SkillTable.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).getEffects(this, target); + SkillTable.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).applyEffects(this, target); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java index bc3340b935..ccba9aa464 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java @@ -525,7 +525,7 @@ public class SepulcherMonsterInstance extends MonsterInstance public void run() { final Skill fp = SkillTable.getInstance().getSkill(4616, 1); // Invulnerable by petrification - fp.getEffects(activeChar, activeChar, false, false, false); + fp.applyEffects(activeChar, activeChar, false, false, false); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java index b1aaf789f2..c2a3d4ae7d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java @@ -46,7 +46,7 @@ public class CancelSkillRestoreTask implements Runnable { continue; } - skill.getEffects(_player, _player); + skill.applyEffects(_player, _player); } } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java index 4fdfeab1e1..b22ebf6475 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Item.java @@ -591,7 +591,7 @@ public abstract class Item { target.removeEffect(target.getFirstEffect(skill.getId())); } - for (Effect e : skill.getEffects(caster, target, false, false, false)) + for (Effect e : skill.applyEffects(caster, target, false, false, false)) { effects.add(e); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java index caaa03f59b..421bac20a8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -343,7 +343,7 @@ public class Weapon extends Item { target.getFirstEffect(skill.getId()).exit(false); } - for (Effect e : skill.getEffects(caster, target, false, false, false)) + for (Effect e : skill.applyEffects(caster, target, false, false, false)) { effects.add(e); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index fd1459603f..6acaa3b2c4 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -429,7 +429,7 @@ class OlympiadGame Skill skill; SystemMessage sm; skill = SkillTable.getInstance().getSkill(1204, 2); - skill.getEffects(player, player); + skill.applyEffects(player, player); player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 2, skill.getHitTime(), 0)); sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(1204); @@ -438,7 +438,7 @@ class OlympiadGame { // Haste Buff to Fighters skill = SkillTable.getInstance().getSkill(1086, 1); - skill.getEffects(player, player); + skill.applyEffects(player, player); player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 1, skill.getHitTime(), 0)); sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(1086); @@ -448,7 +448,7 @@ class OlympiadGame { // Acumen Buff to Mages skill = SkillTable.getInstance().getSkill(1085, 1); - skill.getEffects(player, player); + skill.applyEffects(player, player); player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 1, skill.getHitTime(), 0)); sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(1085); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java index a7d2ab459e..7cb80099f0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java @@ -78,7 +78,7 @@ public class EffectForce extends Effect final Skill newSkill = SkillTable.getInstance().getSkill(getSkill().getId(), forces); if (newSkill != null) { - newSkill.getEffects(getEffector(), getEffected(), false, false, false); + newSkill.applyEffects(getEffector(), getEffected(), false, false, false); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java index 36086efc0c..1b165378a6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java @@ -72,6 +72,6 @@ public class EffectFusion extends Effect private void updateBuff() { exit(false); - SkillTable.getInstance().getSkill(getSkill().getId(), _effect).getEffects(getEffector(), getEffected(), false, false, false); + SkillTable.getInstance().getSkill(getSkill().getId(), _effect).applyEffects(getEffector(), getEffected(), false, false, false); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java index 43935f0ede..5a447267f3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java @@ -86,15 +86,15 @@ public class EffectSignet extends Effect { if ((creature instanceof PlayerInstance) && (((((PlayerInstance) creature).getClanId() > 0) && (caster.getClanId() > 0) && (((PlayerInstance) creature).getClanId() != caster.getClanId())) || ((((PlayerInstance) creature).getAllyId() > 0) && (caster.getAllyId() > 0) && (((PlayerInstance) creature).getAllyId() != caster.getAllyId())) || ((creature.getParty() != null) && (caster.getParty() != null) && !creature.getParty().equals(caster.getParty())))) { - _skill.getEffects(_actor, creature, false, false, false); + _skill.applyEffects(_actor, creature, false, false, false); } } else if (creature instanceof PlayerInstance) { if (((creature.getParty() != null) && (caster.getParty() != null) && creature.getParty().equals(caster.getParty())) || ((((PlayerInstance) creature).getClanId() > 0) && (caster.getClanId() > 0) && (((PlayerInstance) creature).getClanId() == caster.getClanId())) || ((((PlayerInstance) creature).getAllyId() > 0) && (caster.getAllyId() > 0) && (((PlayerInstance) creature).getAllyId() == caster.getAllyId()))) { - _skill.getEffects(_actor, creature, false, false, false); - _skill.getEffects(_actor, caster, false, false, false); // Affect caster too. + _skill.applyEffects(_actor, creature, false, false, false); + _skill.applyEffects(_actor, caster, false, false, false); // Affect caster too. } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java index b14fb07bcb..37b176efeb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java @@ -89,9 +89,9 @@ public class SkillCharge extends Skill } return; } - getEffects(caster, caster, false, false, false); + applyEffects(caster, caster, false, false, false); // cast self effect if any - getEffectsSelf(caster); + applySelfEffects(caster); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java index addbb8a639..5ddde9e18b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java @@ -148,6 +148,6 @@ public class SkillChargeDmg extends Skill seffect.exit(false); } // cast self effect if any - getEffectsSelf(caster); + applySelfEffects(caster); } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java index 4f19ac9933..190067833a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java @@ -87,7 +87,7 @@ public class SkillChargeEffect extends Skill { for (WorldObject target : targets) { - getEffects(creature, (Creature) target, false, false, false); + applyEffects(creature, (Creature) target, false, false, false); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java index 0f010ecbde..a7eae998f5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java @@ -122,7 +122,7 @@ public class SkillDrain extends Skill if (target.reflectSkill(this)) { creature.stopSkillEffects(getId()); - getEffects(null, creature, false, sps, bss); + applyEffects(null, creature, false, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(getId()); creature.sendPacket(sm); @@ -133,7 +133,7 @@ public class SkillDrain extends Skill target.stopSkillEffects(getId()); if (Formulas.getInstance().calcSkillSuccess(creature, target, this, false, sps, bss)) { - getEffects(creature, target, false, sps, bss); + applyEffects(creature, target, false, sps, bss); } else { @@ -172,7 +172,7 @@ public class SkillDrain extends Skill effect.exit(false); } // cast self effect if any - getEffectsSelf(creature); + applySelfEffects(creature); } public void useCubicSkill(CubicInstance activeCubic, List targets) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java index 0edfb867b5..55b29a6592 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java @@ -122,7 +122,7 @@ public class SkillElemental extends Skill // activate attacked effects, if any target.stopSkillEffects(getId()); - getEffects(creature, target, false, sps, bss); + applyEffects(creature, target, false, sps, bss); } if (bss) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java index a58660edf8..2ac5e2dedc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java @@ -52,7 +52,7 @@ public class SkillSeed extends Skill final EffectSeed oldEffect = (EffectSeed) target.getFirstEffect(getId()); if (oldEffect == null) { - getEffects(caster, target, false, false, false); + applyEffects(caster, target, false, false, false); } else { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java index d703a235a6..28e2d61bbc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java @@ -68,7 +68,7 @@ public class SkillSignet extends Skill z = wordPosition.getZ(); } } - getEffects(caster, effectPoint, false, false, false); + applyEffects(caster, effectPoint, false, false, false); effectPoint.setInvul(true); effectPoint.spawnMe(x, y, z); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java index 32682ff69d..8c0fc56ea7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java @@ -42,6 +42,6 @@ public class SkillSignetCasttime extends Skill return; } - getEffectsSelf(caster); + applySelfEffects(caster); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java index 1483b60aae..39871fe003 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java @@ -62,7 +62,7 @@ public class DynamicZone extends ZoneType ((PlayerInstance) creature).sendMessage("You have entered a temporary zone!"); } - _skill.getEffects(_owner, creature, false, false, false); + _skill.applyEffects(_owner, creature, false, false, false); } catch (NullPointerException e) { @@ -126,6 +126,6 @@ public class DynamicZone extends ZoneType @Override protected void onReviveInside(Creature creature) { - _skill.getEffects(_owner, creature, false, false, false); + _skill.applyEffects(_owner, creature, false, false, false); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 5b0d8ab290..08d0a8ef06 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -258,7 +258,7 @@ public class EffectZone extends ZoneType { if (character.getFirstEffect(e.getKey()) == null) { - skill.getEffects(character, character); + skill.applyEffects(character, character); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java index e08638e681..310c01d667 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java @@ -164,7 +164,7 @@ public class PoisonZone extends ZoneType } else { - skill.getEffects(temp, temp, false, false, false); + skill.applyEffects(temp, temp, false, false, false); } } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java index 07892bb2db..e37e8dc1f6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java @@ -884,7 +884,7 @@ public class Frintezza extends Quest final Skill skill = SkillTable.getInstance().getSkill(5017, 1); if (skill != null) { - skill.getEffects(_weakScarlet, _weakScarlet, false, false, false); + skill.applyEffects(_weakScarlet, _weakScarlet, false, false, false); } startQuestTimer("morph_end", 6000, _weakScarlet, null); @@ -976,7 +976,7 @@ public class Frintezza extends Quest final Skill skill = SkillTable.getInstance().getSkill(5017, 1); if (skill != null) { - skill.getEffects(_strongScarlet, _strongScarlet, false, false, false); + skill.applyEffects(_strongScarlet, _strongScarlet, false, false, false); } startQuestTimer("morph_end", 9000, _strongScarlet, null); @@ -1155,7 +1155,7 @@ public class Frintezza extends Quest { if ((creature instanceof PlayerInstance) && (Rnd.get(100) < 80)) { - skill.getEffects(_frintezza, creature, false, false, false); + skill.applyEffects(_frintezza, creature, false, false, false); creature.sendPacket(new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU).addSkillName(5008, 4)); } } @@ -1173,7 +1173,7 @@ public class Frintezza extends Quest creature.setImmobilized(true); creature.setParalyzed(true); creature.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - skill.getEffects(_frintezza, creature, false, false, false); + skill.applyEffects(_frintezza, creature, false, false, false); creature.startAbnormalEffect(Creature.ABNORMAL_EFFECT_DANCE_STUNNED); creature.sendPacket(new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU).addSkillName(5008, 5)); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index 51f74a2eb2..33fdc50079 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -1152,7 +1152,7 @@ public class VanHalter extends Quest { if (pc.getFirstEffect(bleed) == null) { - bleed.getEffects(tr, pc, false, false, false); + bleed.applyEffects(tr, pc, false, false, false); tr.broadcastPacket(new MagicSkillUse(tr, pc, bleed.getId(), 12, 1, 1)); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java index f167824f68..a176c5b792 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java @@ -151,7 +151,7 @@ public class Q365_DevilsLegacy extends Quest final Skill skill = SkillTable.getInstance().getSkill(4082, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { - skill.getEffects(npc, player); + skill.applyEffects(npc, player); } } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index ad371523f7..592312bf2e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -236,7 +236,7 @@ public class Q421_LittleWingsBigAdventure extends Quest final Skill skill = SkillTable.getInstance().getSkill(4167, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { - skill.getEffects(npc, player); + skill.applyEffects(npc, player); } } break; @@ -312,7 +312,7 @@ public class Q421_LittleWingsBigAdventure extends Quest final Skill skill = SkillTable.getInstance().getSkill(4243, 1); if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) { - skill.getEffects(npc, originalKiller); + skill.applyEffects(npc, originalKiller); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index 1b7c8aee11..52298d16ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -169,7 +169,7 @@ public class Q501_ProofOfClanAlliance extends Quest st.takeItems(SYMBOL_OF_LOYALTY, 1); st.takeItems(SYMBOL_OF_LOYALTY, 1); st.giveItems(ANTIDOTE_RECIPE_LIST, 1); - SkillTable.getInstance().getSkill(4082, 1).getEffects(npc, player); + SkillTable.getInstance().getSkill(4082, 1).applyEffects(npc, player); startQuestTimer("poison", 60000, npc, player, true); st.playSound(QuestState.SOUND_MIDDLE); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java index ad91cbaef0..8f2bbd6b74 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java @@ -88,7 +88,7 @@ public class EnergyStone implements IItemHandler final Skill dummy = SkillTable.getInstance().getSkill(skill.getId(), skill.getLevel()); if (dummy != null) { - dummy.getEffects(player, player); + dummy.applyEffects(player, player); player.sendPacket(new MagicSkillUse(playable, player, skill.getId(), 1, 1, 0)); player.destroyItemWithoutTrace("Consume", item.getObjectId(), 1, null, false); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java index e69d9c62d4..4efe80fda4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Blow.java @@ -113,7 +113,7 @@ public class Blow implements ISkillHandler target.stopSkillEffects(skill.getId()); if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill); target.sendPacket(sm); @@ -279,7 +279,7 @@ public class Blow implements ISkillHandler { effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java index 5180290250..681fe620c3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Charge.java @@ -46,7 +46,7 @@ public class Charge implements ISkillHandler continue; } final PlayerInstance target = (PlayerInstance) target1; - skill.getEffects(creature, target, false, false, false); + skill.applyEffects(creature, target, false, false, false); } // self Effect :] @@ -56,7 +56,7 @@ public class Charge implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java index 1eb6d7c2b3..d0b17db217 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/ClanGate.java @@ -78,7 +78,7 @@ public class ClanGate implements ISkillHandler { effect.exit(false); } - skill.getEffectsSelf(player); + skill.applySelfEffects(player); } private class RemoveClanGate implements Runnable diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java index df301b2f5c..11e3874125 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java @@ -237,7 +237,7 @@ public class Continuous implements ISkillHandler final DuelManager dm = DuelManager.getInstance(); if (dm != null) { - final Effect[] effects = skill.getEffects(creature, target, ss, sps, bss); + final Effect[] effects = skill.applyEffects(creature, target, ss, sps, bss); if (effects != null) { for (Effect buff : effects) @@ -252,7 +252,7 @@ public class Continuous implements ISkillHandler } else { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } if (skill.getSkillType() == SkillType.AGGDEBUFF) @@ -299,7 +299,7 @@ public class Continuous implements ISkillHandler } } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } @Override diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java index 10b4d5f8d8..f4a30cbc10 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/CpDam.java @@ -88,7 +88,7 @@ public class CpDam implements ISkillHandler target.breakAttack(); target.breakCast(); } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); creature.sendDamageMessage(target, damage, false, false, false); target.setCurrentCp(target.getCurrentCp() - damage); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java index 5be7b70b2d..75b773625f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Disablers.java @@ -105,7 +105,7 @@ public class Disablers implements ISkillHandler { if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else { @@ -119,7 +119,7 @@ public class Disablers implements ISkillHandler case FAKE_DEATH: { // stun/fakedeath is not mdef dependant, it depends on lvl difference, target CON and power of stun - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); break; } case STUN: @@ -145,7 +145,7 @@ public class Disablers implements ISkillHandler } if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -165,7 +165,7 @@ public class Disablers implements ISkillHandler } if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -185,7 +185,7 @@ public class Disablers implements ISkillHandler } if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -209,7 +209,7 @@ public class Disablers implements ISkillHandler e.exit(false); } } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -224,7 +224,7 @@ public class Disablers implements ISkillHandler target.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, creature, (int) ((150 * skill.getPower()) / (target.getLevel() + 7))); } // TODO [Nemesiss] should this have 100% chance? - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); break; } case AGGREDUCE: @@ -232,7 +232,7 @@ public class Disablers implements ISkillHandler // these skills needs to be rechecked if (target instanceof Attackable) { - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); final double aggdiff = ((Attackable) target).getHating(creature) - target.calcStat(Stat.AGGRESSION, ((Attackable) target).getHating(creature), target, skill); if (skill.getPower() > 0) { @@ -263,7 +263,7 @@ public class Disablers implements ISkillHandler attackable.setWalking(); } } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (Formulas.getInstance().calcSkillSuccess(creature, target, skill, ss, sps, bss)) { @@ -279,7 +279,7 @@ public class Disablers implements ISkillHandler targ.setWalking(); } } - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); } else if (creature instanceof PlayerInstance) { @@ -754,7 +754,7 @@ public class Disablers implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } private void negateEffect(Creature target, SkillType type, double power) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java index 8452ae1cec..7b12ce2839 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Mdam.java @@ -92,7 +92,7 @@ public class Mdam implements ISkillHandler if (target.reflectSkill(skill)) { creature.stopSkillEffects(skill.getId()); - skill.getEffects(null, creature, false, sps, bss); + skill.applyEffects(null, creature, false, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill.getId()); creature.sendPacket(sm); @@ -101,7 +101,7 @@ public class Mdam implements ISkillHandler { // Like L2OFF must remove the first effect only if the second effect is successful target.stopSkillEffects(skill.getId()); - skill.getEffects(creature, target, false, sps, bss); + skill.applyEffects(creature, target, false, sps, bss); } else { @@ -132,7 +132,7 @@ public class Mdam implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); if (skill.isSuicideAttack()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index 552957fc5b..3f3cdc0f17 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -151,7 +151,7 @@ public class Pdam implements ISkillHandler { creature.stopSkillEffects(skill.getId()); - skill.getEffects(null, creature, ss, sps, bss); + skill.applyEffects(null, creature, ss, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill.getId()); creature.sendPacket(sm); @@ -159,7 +159,7 @@ public class Pdam implements ISkillHandler else if (f.calcSkillSuccess(creature, target, skill, soul, false, false)) // activate attacked effects, if any { // Like L2OFF must remove the first effect if the second effect lands - skill.getEffects(creature, target, ss, sps, bss); + skill.applyEffects(creature, target, ss, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skill.getId()); target.sendPacket(sm); @@ -316,12 +316,12 @@ public class Pdam implements ISkillHandler else if (skill.getId() == 345) // Sonic Rage { final Skill dummy = SkillTable.getInstance().getSkill(8, 7); // Lv7 Sonic Focus - dummy.getEffects(creature, creature, ss, sps, bss); + dummy.applyEffects(creature, creature, ss, sps, bss); } else if (skill.getId() == 346) // Raging Force { final Skill dummy = SkillTable.getInstance().getSkill(50, 7); // Lv7 Focused Force - dummy.getEffects(creature, creature, ss, sps, bss); + dummy.applyEffects(creature, creature, ss, sps, bss); } } // self Effect :] @@ -331,7 +331,7 @@ public class Pdam implements ISkillHandler // Replace old effect with new one. effect.exit(false); } - skill.getEffectsSelf(creature); + skill.applySelfEffects(creature); } if (skill.isMagic()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java index 14bf2af523..5a1e56b0cc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java @@ -168,7 +168,7 @@ public class Wedding implements IVoicedCommandHandler final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); if (activeChar.getFirstEffect(skill) == null) { - skill.getEffects(activeChar, activeChar, false, false, false); + skill.applyEffects(activeChar, activeChar, false, false, false); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skillId); activeChar.sendPacket(sm); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java index ef994f7db3..73dc8f89a9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java @@ -61,7 +61,7 @@ public class ForceBuff final Skill force = SkillTable.getInstance().getSkill(_forceId, _forceLevel); if (force != null) { - force.getEffects(_caster, _target, false, false, false); + force.applyEffects(_caster, _target, false, false, false); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java index 48135af1a4..0e4794a7f0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java @@ -2657,12 +2657,12 @@ public abstract class Skill return (_effectTemplates != null) && (_effectTemplates.length > 0); } - public Effect[] getEffects(Creature effector, Creature effected) + public Effect[] applyEffects(Creature effector, Creature effected) { - return getEffects(effector, effected, false, false, false); + return applyEffects(effector, effected, false, false, false); } - public Effect[] getEffects(Creature effector, Creature effected, boolean ss, boolean sps, boolean bss) + public Effect[] applyEffects(Creature effector, Creature effected, boolean ss, boolean sps, boolean bss) { if (isPassive()) { @@ -2723,7 +2723,7 @@ public abstract class Skill return effects.toArray(new Effect[effects.size()]); } - public Effect[] getEffectsSelf(Creature effector) + public Effect[] applySelfEffects(Creature effector) { if (isPassive()) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 976d4e08a6..5942d36a25 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -6188,7 +6188,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder abortAttack(); abortCast(); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - skill.getEffects(target, this, false, false, false); + skill.applyEffects(target, this, false, false, false); if (this instanceof Summon) { final Summon src = ((Summon) this); @@ -6197,7 +6197,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder src.getOwner().abortAttack(); src.getOwner().abortCast(); src.getOwner().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - skill.getEffects(target, src.getOwner(), false, false, false); + skill.applyEffects(target, src.getOwner(), false, false, false); } } } @@ -7941,7 +7941,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder abortAttack(); abortCast(); getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - tempSkill.getEffects(creature, this, false, false, false); + tempSkill.applyEffects(creature, this, false, false, false); if (this instanceof Summon) { final Summon src = ((Summon) this); @@ -7950,7 +7950,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder src.getOwner().abortAttack(); src.getOwner().abortCast(); src.getOwner().getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); - tempSkill.getEffects(creature, src.getOwner(), false, false, false); + tempSkill.applyEffects(creature, src.getOwner(), false, false, false); } } } @@ -7964,7 +7964,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder final Skill tempSkill = SkillTable.getInstance().getSkill(4515, 1); if (tempSkill != null) { - tempSkill.getEffects(creature, this, false, false, false); + tempSkill.applyEffects(creature, this, false, false, false); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java index f4ce7ac652..b51efab696 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java @@ -161,7 +161,7 @@ public class CabaleBufferInstance extends NpcInstance final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); if (player.getFirstEffect(skill) == null) { - skill.getEffects(_caster, player, false, false, false); + skill.applyEffects(_caster, player, false, false, false); broadcastPacket(new MagicSkillUse(_caster, player, skill.getId(), skillLevel, skill.getHitTime(), 0)); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(skillId); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java index e01b2b59d3..3ebaa2c617 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java @@ -212,7 +212,7 @@ public class ChestInstance extends MonsterInstance final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); if (creature.getFirstEffect(skill) == null) { - skill.getEffects(this, creature, false, false, false); + skill.applyEffects(this, creature, false, false, false); broadcastPacket(new MagicSkillUse(this, creature, skill.getId(), skillLevel, skill.getHitTime(), 0)); return true; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java index ab223c8ac8..27206b137c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java @@ -707,7 +707,7 @@ public class CubicInstance if ((target instanceof PlayerInstance) && ((PlayerInstance) target).isInDuel() && (skill.getSkillType() == SkillType.DEBUFF) && (activeCubic.getOwner().getDuelId() == ((PlayerInstance) target).getDuelId())) { final DuelManager dm = DuelManager.getInstance(); - for (Effect debuff : skill.getEffects(activeCubic.getOwner(), target)) + for (Effect debuff : skill.applyEffects(activeCubic.getOwner(), target)) { if (debuff != null) { @@ -717,7 +717,7 @@ public class CubicInstance } else { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } } } @@ -771,7 +771,7 @@ public class CubicInstance } if (Formulas.calcCubicSkillSuccess(activeCubic, target, skill)) { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } } @@ -806,7 +806,7 @@ public class CubicInstance if ((target instanceof PlayerInstance) && ((PlayerInstance) target).isInDuel() && (skill.getSkillType() == SkillType.DEBUFF) && (activeCubic.getOwner().getDuelId() == ((PlayerInstance) target).getDuelId())) { final DuelManager dm = DuelManager.getInstance(); - for (Effect debuff : skill.getEffects(activeCubic.getOwner(), target)) + for (Effect debuff : skill.applyEffects(activeCubic.getOwner(), target)) { if (debuff != null) { @@ -816,7 +816,7 @@ public class CubicInstance } else { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } } break; @@ -829,7 +829,7 @@ public class CubicInstance if ((target instanceof PlayerInstance) && ((PlayerInstance) target).isInDuel() && (skill.getSkillType() == SkillType.DEBUFF) && (activeCubic.getOwner().getDuelId() == ((PlayerInstance) target).getDuelId())) { final DuelManager dm = DuelManager.getInstance(); - for (Effect debuff : skill.getEffects(activeCubic.getOwner(), target)) + for (Effect debuff : skill.applyEffects(activeCubic.getOwner(), target)) { if (debuff != null) { @@ -839,7 +839,7 @@ public class CubicInstance } else { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } } break; @@ -875,7 +875,7 @@ public class CubicInstance if ((target instanceof PlayerInstance) && ((PlayerInstance) target).isInDuel() && (skill.getSkillType() == SkillType.DEBUFF) && (activeCubic.getOwner().getDuelId() == ((PlayerInstance) target).getDuelId())) { final DuelManager dm = DuelManager.getInstance(); - for (Effect debuff : skill.getEffects(activeCubic.getOwner(), target)) + for (Effect debuff : skill.applyEffects(activeCubic.getOwner(), target)) { if (debuff != null) { @@ -885,7 +885,7 @@ public class CubicInstance } else { - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } } break; @@ -898,7 +898,7 @@ public class CubicInstance { target.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, activeCubic.getOwner(), (int) ((150 * skill.getPower()) / (target.getLevel() + 7))); } - skill.getEffects(activeCubic.getOwner(), target); + skill.applyEffects(activeCubic.getOwner(), target); } break; } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index e95e7710ed..9689c3d586 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -1553,7 +1553,7 @@ public class NpcInstance extends Creature } final Skill skill = SkillTable.getInstance().getSkill(5182, 1); broadcastPacket(new MagicSkillUse(this, player, skill.getId(), skill.getLevel(), 0, 0)); - skill.getEffects(this, player); + skill.applyEffects(this, player); } /** @@ -2127,7 +2127,7 @@ public class NpcInstance extends Creature if (skill != null) { broadcastPacket(new MagicSkillUse(this, player, skill.getId(), skill.getLevel(), 0, 0)); - skill.getEffects(this, player); + skill.applyEffects(this, player); } player.setCurrentCp(player.getMaxCp()); @@ -2206,7 +2206,7 @@ public class NpcInstance extends Creature else { broadcastPacket(new MagicSkillUse(this, player, skill.getId(), skill.getLevel(), 0, 0)); - skill.getEffects(this, player); + skill.applyEffects(this, player); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 0d38b9b75b..a71afe66e4 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2944,7 +2944,7 @@ public class PlayerInstance extends Playable { // stop old toggle skill effect, and give new toggle skill effect back toggleEffect.exit(false); - sk.getEffects(this, this, false, false, false); + sk.applyEffects(this, this, false, false, false); } } @@ -9252,7 +9252,7 @@ public class PlayerInstance extends Playable if (activateEffects) { final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel); - skill.getEffects(this, this, false, false, false); + skill.applyEffects(this, this, false, false, false); for (Effect effect : getAllEffects()) { if (effect.getSkill().getId() == skillId) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java index 4bb7d8b5c1..0c6ae8e45b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java @@ -82,7 +82,7 @@ public class ProtectorInstance extends NpcInstance if (player.getFirstEffect(skill) == null) { final int objId = _caster.getObjectId(); - skill.getEffects(_caster, player, false, false, false); + skill.applyEffects(_caster, player, false, false, false); broadcastPacket(new MagicSkillUse(_caster, player, skillId, skillLevel, Config.PROTECTOR_SKILLTIME, 0)); broadcastPacket(new CreatureSay(objId, ChatType.GENERAL, getName(), Config.PROTECTOR_MESSAGE)); return true; @@ -103,7 +103,7 @@ public class ProtectorInstance extends NpcInstance if (player.getFirstEffect(skill) == null) { final int objId = _caster.getObjectId(); - skill.getEffects(_caster, player, false, false, false); + skill.applyEffects(_caster, player, false, false, false); broadcastPacket(new MagicSkillUse(_caster, player, skillId, skillLevel, Config.PROTECTOR_SKILLTIME, 0)); broadcastPacket(new CreatureSay(objId, ChatType.GENERAL, getName(), Config.PROTECTOR_MESSAGE)); return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index b2ad2ef053..e27985de84 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -116,7 +116,7 @@ public class SchemeBufferInstance extends FolkInstance { for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName)) { - SkillTable.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).getEffects(this, target); + SkillTable.getInstance().getSkill(skillId, SchemeBufferTable.getInstance().getAvailableBuff(skillId).getLevel()).applyEffects(this, target); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java index bc3340b935..ccba9aa464 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java @@ -525,7 +525,7 @@ public class SepulcherMonsterInstance extends MonsterInstance public void run() { final Skill fp = SkillTable.getInstance().getSkill(4616, 1); // Invulnerable by petrification - fp.getEffects(activeChar, activeChar, false, false, false); + fp.applyEffects(activeChar, activeChar, false, false, false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java index b1aaf789f2..c2a3d4ae7d 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/tasks/player/CancelSkillRestoreTask.java @@ -46,7 +46,7 @@ public class CancelSkillRestoreTask implements Runnable { continue; } - skill.getEffects(_player, _player); + skill.applyEffects(_player, _player); } } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java index 81ead434f7..614bb10055 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java @@ -591,7 +591,7 @@ public abstract class Item { target.removeEffect(target.getFirstEffect(skill.getId())); } - for (Effect e : skill.getEffects(caster, target, false, false, false)) + for (Effect e : skill.applyEffects(caster, target, false, false, false)) { effects.add(e); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java index caaa03f59b..421bac20a8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -343,7 +343,7 @@ public class Weapon extends Item { target.getFirstEffect(skill.getId()).exit(false); } - for (Effect e : skill.getEffects(caster, target, false, false, false)) + for (Effect e : skill.applyEffects(caster, target, false, false, false)) { effects.add(e); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java index 6eef315744..457e43d15f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/olympiad/OlympiadGame.java @@ -429,7 +429,7 @@ class OlympiadGame Skill skill; SystemMessage sm; skill = SkillTable.getInstance().getSkill(1204, 2); - skill.getEffects(player, player); + skill.applyEffects(player, player); player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 2, skill.getHitTime(), 0)); sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(1204); @@ -438,7 +438,7 @@ class OlympiadGame { // Haste Buff to Fighters skill = SkillTable.getInstance().getSkill(1086, 1); - skill.getEffects(player, player); + skill.applyEffects(player, player); player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 1, skill.getHitTime(), 0)); sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(1086); @@ -448,7 +448,7 @@ class OlympiadGame { // Acumen Buff to Mages skill = SkillTable.getInstance().getSkill(1085, 1); - skill.getEffects(player, player); + skill.applyEffects(player, player); player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 1, skill.getHitTime(), 0)); sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(1085); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java index a7d2ab459e..7cb80099f0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java @@ -78,7 +78,7 @@ public class EffectForce extends Effect final Skill newSkill = SkillTable.getInstance().getSkill(getSkill().getId(), forces); if (newSkill != null) { - newSkill.getEffects(getEffector(), getEffected(), false, false, false); + newSkill.applyEffects(getEffector(), getEffected(), false, false, false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java index 36086efc0c..1b165378a6 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java @@ -72,6 +72,6 @@ public class EffectFusion extends Effect private void updateBuff() { exit(false); - SkillTable.getInstance().getSkill(getSkill().getId(), _effect).getEffects(getEffector(), getEffected(), false, false, false); + SkillTable.getInstance().getSkill(getSkill().getId(), _effect).applyEffects(getEffector(), getEffected(), false, false, false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java index 43935f0ede..5a447267f3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java @@ -86,15 +86,15 @@ public class EffectSignet extends Effect { if ((creature instanceof PlayerInstance) && (((((PlayerInstance) creature).getClanId() > 0) && (caster.getClanId() > 0) && (((PlayerInstance) creature).getClanId() != caster.getClanId())) || ((((PlayerInstance) creature).getAllyId() > 0) && (caster.getAllyId() > 0) && (((PlayerInstance) creature).getAllyId() != caster.getAllyId())) || ((creature.getParty() != null) && (caster.getParty() != null) && !creature.getParty().equals(caster.getParty())))) { - _skill.getEffects(_actor, creature, false, false, false); + _skill.applyEffects(_actor, creature, false, false, false); } } else if (creature instanceof PlayerInstance) { if (((creature.getParty() != null) && (caster.getParty() != null) && creature.getParty().equals(caster.getParty())) || ((((PlayerInstance) creature).getClanId() > 0) && (caster.getClanId() > 0) && (((PlayerInstance) creature).getClanId() == caster.getClanId())) || ((((PlayerInstance) creature).getAllyId() > 0) && (caster.getAllyId() > 0) && (((PlayerInstance) creature).getAllyId() == caster.getAllyId()))) { - _skill.getEffects(_actor, creature, false, false, false); - _skill.getEffects(_actor, caster, false, false, false); // Affect caster too. + _skill.applyEffects(_actor, creature, false, false, false); + _skill.applyEffects(_actor, caster, false, false, false); // Affect caster too. } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java index 948744b7a4..856247dfca 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillCharge.java @@ -91,9 +91,9 @@ public class SkillCharge extends Skill } return; } - getEffects(caster, caster, false, false, false); + applyEffects(caster, caster, false, false, false); // cast self effect if any - getEffectsSelf(caster); + applySelfEffects(caster); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java index 40684b2854..bf0e9a2004 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeDmg.java @@ -154,6 +154,6 @@ public class SkillChargeDmg extends Skill seffect.exit(false); } // cast self effect if any - getEffectsSelf(caster); + applySelfEffects(caster); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java index 3e6272ffb8..4d4f9c8c7b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillChargeEffect.java @@ -88,7 +88,7 @@ public class SkillChargeEffect extends Skill { for (WorldObject target : targets) { - getEffects(creature, (Creature) target, false, false, false); + applyEffects(creature, (Creature) target, false, false, false); } } if (creature instanceof PlayerInstance) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java index 0f010ecbde..a7eae998f5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillDrain.java @@ -122,7 +122,7 @@ public class SkillDrain extends Skill if (target.reflectSkill(this)) { creature.stopSkillEffects(getId()); - getEffects(null, creature, false, sps, bss); + applyEffects(null, creature, false, sps, bss); final SystemMessage sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU); sm.addSkillName(getId()); creature.sendPacket(sm); @@ -133,7 +133,7 @@ public class SkillDrain extends Skill target.stopSkillEffects(getId()); if (Formulas.getInstance().calcSkillSuccess(creature, target, this, false, sps, bss)) { - getEffects(creature, target, false, sps, bss); + applyEffects(creature, target, false, sps, bss); } else { @@ -172,7 +172,7 @@ public class SkillDrain extends Skill effect.exit(false); } // cast self effect if any - getEffectsSelf(creature); + applySelfEffects(creature); } public void useCubicSkill(CubicInstance activeCubic, List targets) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java index 0edfb867b5..55b29a6592 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillElemental.java @@ -122,7 +122,7 @@ public class SkillElemental extends Skill // activate attacked effects, if any target.stopSkillEffects(getId()); - getEffects(creature, target, false, sps, bss); + applyEffects(creature, target, false, sps, bss); } if (bss) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java index a58660edf8..2ac5e2dedc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSeed.java @@ -52,7 +52,7 @@ public class SkillSeed extends Skill final EffectSeed oldEffect = (EffectSeed) target.getFirstEffect(getId()); if (oldEffect == null) { - getEffects(caster, target, false, false, false); + applyEffects(caster, target, false, false, false); } else { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java index d703a235a6..28e2d61bbc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignet.java @@ -68,7 +68,7 @@ public class SkillSignet extends Skill z = wordPosition.getZ(); } } - getEffects(caster, effectPoint, false, false, false); + applyEffects(caster, effectPoint, false, false, false); effectPoint.setInvul(true); effectPoint.spawnMe(x, y, z); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java index 32682ff69d..8c0fc56ea7 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/handlers/SkillSignetCasttime.java @@ -42,6 +42,6 @@ public class SkillSignetCasttime extends Skill return; } - getEffectsSelf(caster); + applySelfEffects(caster); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java index 1483b60aae..39871fe003 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/DynamicZone.java @@ -62,7 +62,7 @@ public class DynamicZone extends ZoneType ((PlayerInstance) creature).sendMessage("You have entered a temporary zone!"); } - _skill.getEffects(_owner, creature, false, false, false); + _skill.applyEffects(_owner, creature, false, false, false); } catch (NullPointerException e) { @@ -126,6 +126,6 @@ public class DynamicZone extends ZoneType @Override protected void onReviveInside(Creature creature) { - _skill.getEffects(_owner, creature, false, false, false); + _skill.applyEffects(_owner, creature, false, false, false); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 8b450970c6..9932bb85e9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -264,7 +264,7 @@ public class EffectZone extends ZoneType { if (character.getFirstEffect(e.getKey()) == null) { - skill.getEffects(character, character); + skill.applyEffects(character, character); } } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java index e08638e681..310c01d667 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java @@ -164,7 +164,7 @@ public class PoisonZone extends ZoneType } else { - skill.getEffects(temp, temp, false, false, false); + skill.applyEffects(temp, temp, false, false, false); } } }