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

Created L2Character method abortAllSkillCasters.

Browse Source
This commit is contained in:
MobiusDev 2019-02-17 08:50:48 +00:00
parent 6943ed2f94
commit 47300f236f
40 changed files with 180 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);

6
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/BlockActions.java vendored
View File

@ -29,7 +29,6 @@ import com.l2jmobius.gameserver.model.effects.AbstractEffect;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.effects.L2EffectType;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
/**
* Block Actions effect implementation.
@ -63,10 +62,7 @@ public final class BlockActions extends AbstractEffect
_allowedSkills.stream().forEach(effected::addBlockActionsAllowedSkill);
effected.startParalyze();
// Cancel running skill casters.
for (SkillCaster skillCaster : effected.getSkillCasters())
{
skillCaster.stopCasting(true);
}
effected.abortAllSkillCasters();
}
@Override

15
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Character.java
View File

@ -2836,6 +2836,21 @@ public abstract class L2Character extends L2Object implements ISkillsHolder, IDe
}
}
/**
* Abort the cast of all skills.
*/
public final void abortAllSkillCasters()
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
if (isPlayer())
{
getActingPlayer().setQueuedSkill(null, null, false, false);
}
}
}
/**
* Abort the cast of normal non-simultaneous skills.
* @return {@code true} if a skill casting has been aborted, {@code false} otherwise.

5
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/L2Summon.java
View File

@ -425,10 +425,7 @@ public abstract class L2Summon extends L2Playable
}
// Cancel running skill casters.
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
stopAllEffects();
stopHpMpRegeneration();

6
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/instance/L2MonsterInstance.java
View File

@ -26,7 +26,6 @@ import com.l2jmobius.gameserver.model.actor.templates.L2NpcTemplate;
import com.l2jmobius.gameserver.model.effects.EffectFlag;
import com.l2jmobius.gameserver.model.items.instance.L2ItemInstance;
import com.l2jmobius.gameserver.model.skills.Skill;
import com.l2jmobius.gameserver.model.skills.SkillCaster;
import com.l2jmobius.gameserver.util.MinionList;
/**
@ -249,10 +248,7 @@ public class L2MonsterInstance extends L2Attackable
// Might need some exceptions here, but it will prevent the monster buffing player bug.
if (!skill.isBad() && (getTarget() != null) && getTarget().isPlayer())
{
for (SkillCaster skillCaster : getSkillCasters())
{
skillCaster.stopCasting(true);
}
abortAllSkillCasters();
return;
}
super.doCast(skill, item, ctrlPressed, shiftPressed);