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

Simplified EffectList class name.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-03-28 12:50:26 +00:00
parent 64570493f6
commit 1bf6e18fc5
59 changed files with 8371 additions and 8371 deletions
Download Patch File Download Diff File Expand all files Collapse all files
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/CharEffectList.java → L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/EffectList.java
+3 -3
View File
@@ -61,9 +61,9 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate;
* Methods may resemble List interface, although it doesn't implement such interface. * Methods may resemble List interface, although it doesn't implement such interface.
* @author Zoey76 * @author Zoey76
*/ */
public final class CharEffectList public final class EffectList
{ {
private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); private static final Logger LOGGER = Logger.getLogger(EffectList.class.getName());
/** Queue containing all effects from buffs for this effect list. */ /** Queue containing all effects from buffs for this effect list. */
private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>(); private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>();
/** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */
@@ -99,7 +99,7 @@ public final class CharEffectList
* Constructor for effect list. * Constructor for effect list.
* @param owner the creature that owns this effect list * @param owner the creature that owns this effect list
*/ */
public CharEffectList(Creature owner) public EffectList(Creature owner)
{ {
_owner = owner; _owner = owner;
} }
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4676,7 +4676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -783,7 +783,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/CharEffectList.java → L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/EffectList.java
+3 -3
View File
@@ -61,9 +61,9 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate;
* Methods may resemble List interface, although it doesn't implement such interface. * Methods may resemble List interface, although it doesn't implement such interface.
* @author Zoey76 * @author Zoey76
*/ */
public final class CharEffectList public final class EffectList
{ {
private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); private static final Logger LOGGER = Logger.getLogger(EffectList.class.getName());
/** Queue containing all effects from buffs for this effect list. */ /** Queue containing all effects from buffs for this effect list. */
private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>(); private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>();
/** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */
@@ -99,7 +99,7 @@ public final class CharEffectList
* Constructor for effect list. * Constructor for effect list.
* @param owner the creature that owns this effect list * @param owner the creature that owns this effect list
*/ */
public CharEffectList(Creature owner) public EffectList(Creature owner)
{ {
_owner = owner; _owner = owner;
} }
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4676,7 +4676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -783,7 +783,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/CharEffectList.java → L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/EffectList.java
+3 -3
View File
@@ -61,9 +61,9 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate;
* Methods may resemble List interface, although it doesn't implement such interface. * Methods may resemble List interface, although it doesn't implement such interface.
* @author Zoey76 * @author Zoey76
*/ */
public final class CharEffectList public final class EffectList
{ {
private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); private static final Logger LOGGER = Logger.getLogger(EffectList.class.getName());
/** Queue containing all effects from buffs for this effect list. */ /** Queue containing all effects from buffs for this effect list. */
private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>(); private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>();
/** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */
@@ -99,7 +99,7 @@ public final class CharEffectList
* Constructor for effect list. * Constructor for effect list.
* @param owner the creature that owns this effect list * @param owner the creature that owns this effect list
*/ */
public CharEffectList(Creature owner) public EffectList(Creature owner)
{ {
_owner = owner; _owner = owner;
} }
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4676,7 +4676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -783,7 +783,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/CharEffectList.java → L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/EffectList.java
+3 -3
View File
@@ -61,9 +61,9 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate;
* Methods may resemble List interface, although it doesn't implement such interface. * Methods may resemble List interface, although it doesn't implement such interface.
* @author Zoey76 * @author Zoey76
*/ */
public final class CharEffectList public final class EffectList
{ {
private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); private static final Logger LOGGER = Logger.getLogger(EffectList.class.getName());
/** Queue containing all effects from buffs for this effect list. */ /** Queue containing all effects from buffs for this effect list. */
private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>(); private volatile Queue<BuffInfo> _actives = new ConcurrentLinkedQueue<>();
/** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */ /** List containing all passives for this effect list. They bypass most of the actions and they are not included in most operations. */
@@ -99,7 +99,7 @@ public final class CharEffectList
* Constructor for effect list. * Constructor for effect list.
* @param owner the creature that owns this effect list * @param owner the creature that owns this effect list
*/ */
public CharEffectList(Creature owner) public EffectList(Creature owner)
{ {
_owner = owner; _owner = owner;
} }
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4676,7 +4676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -783,7 +783,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java
Vendored
+4 -4
View File
@@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -75,7 +75,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackAeoreLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackAeoreLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitAeoreLevel = 0; limitAeoreLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
@@ -98,7 +98,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackSigelLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackSigelLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitSigelLevel = 0; limitSigelLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
@@ -121,7 +121,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackIssLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackIssLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitIssLevel = 0; limitIssLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/CharEffectList.java
-1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/EffectList.java
+1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4676,7 +4676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -783,7 +783,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java
Vendored
+4 -4
View File
@@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -75,7 +75,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackAeoreLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackAeoreLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitAeoreLevel = 0; limitAeoreLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
@@ -98,7 +98,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackSigelLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackSigelLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitSigelLevel = 0; limitSigelLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
@@ -121,7 +121,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackIssLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackIssLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitIssLevel = 0; limitIssLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/CharEffectList.java
-1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/EffectList.java
+1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4676,7 +4676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -783,7 +783,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/TrackLimitedSkill.java
Vendored
+4 -4
View File
@@ -16,7 +16,7 @@
*/ */
package handlers.effecthandlers; package handlers.effecthandlers;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -75,7 +75,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackAeoreLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackAeoreLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitAeoreLevel = 0; limitAeoreLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
@@ -98,7 +98,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackSigelLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackSigelLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitSigelLevel = 0; limitSigelLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
@@ -121,7 +121,7 @@ public class TrackLimitedSkill extends AbstractEffect
private void trackIssLimit(Creature effector, Creature effected, Skill skill, int limitSkillId) private void trackIssLimit(Creature effector, Creature effected, Skill skill, int limitSkillId)
{ {
limitIssLevel = 0; limitIssLevel = 0;
CharEffectList effectList = effected.getEffectList(); EffectList effectList = effected.getEffectList();
for (BuffInfo debuff : effectList.getDebuffs()) for (BuffInfo debuff : effectList.getDebuffs())
{ {
if (debuff.getSkill().getId() == limitSkillId) if (debuff.getSkill().getId() == limitSkillId)
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/CharEffectList.java
-1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/EffectList.java
+1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4676,7 +4676,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -783,7 +783,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlot.java
Vendored
+2 -2
View File
@@ -21,7 +21,7 @@ import java.util.EnumMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.conditions.Condition; import com.l2jmobius.gameserver.model.conditions.Condition;
@@ -80,7 +80,7 @@ public final class DispelBySlot extends AbstractEffect
} }
final Creature effected = info.getEffected(); final Creature effected = info.getEffected();
final CharEffectList effectList = effected.getEffectList(); final EffectList effectList = effected.getEffectList();
// There is no need to iterate over all buffs, // There is no need to iterate over all buffs,
// Just iterate once over all slots to dispel and get the buff with that abnormal if exists, // Just iterate once over all slots to dispel and get the buff with that abnormal if exists,
// Operation of O(n) for the amount of slots to dispel (which is usually small) and O(1) to get the buff. // Operation of O(n) for the amount of slots to dispel (which is usually small) and O(1) to get the buff.
L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/DispelBySlotProbability.java
Vendored
+2 -2
View File
@@ -22,7 +22,7 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import com.l2jmobius.commons.util.Rnd; import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.StatsSet; import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.conditions.Condition; import com.l2jmobius.gameserver.model.conditions.Condition;
@@ -83,7 +83,7 @@ public final class DispelBySlotProbability extends AbstractEffect
} }
final Creature effected = info.getEffected(); final Creature effected = info.getEffected();
final CharEffectList effectList = effected.getEffectList(); final EffectList effectList = effected.getEffectList();
// There is no need to iterate over all buffs, // There is no need to iterate over all buffs,
// Just iterate once over all slots to dispel and get the buff with that abnormal if exists, // Just iterate once over all slots to dispel and get the buff with that abnormal if exists,
// Operation of O(n) for the amount of slots to dispel (which is usually small) and O(1) to get the buff. // Operation of O(n) for the amount of slots to dispel (which is usually small) and O(1) to get the buff.
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/CharEffectList.java → L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/EffectList.java
+3 -3
View File
@@ -59,9 +59,9 @@ import com.l2jmobius.gameserver.network.serverpackets.ShortBuffStatusUpdate;
* Methods may resemble List interface, although it doesn't implement such interface. * Methods may resemble List interface, although it doesn't implement such interface.
* @author Zoey76 * @author Zoey76
*/ */
public final class CharEffectList public final class EffectList
{ {
private static final Logger LOGGER = Logger.getLogger(CharEffectList.class.getName()); private static final Logger LOGGER = Logger.getLogger(EffectList.class.getName());
/** Queue containing all effects from buffs for this effect list. */ /** Queue containing all effects from buffs for this effect list. */
private volatile Queue<BuffInfo> _buffs = new ConcurrentLinkedQueue<>(); private volatile Queue<BuffInfo> _buffs = new ConcurrentLinkedQueue<>();
/** Queue containing all triggered skills for this effect list. */ /** Queue containing all triggered skills for this effect list. */
@@ -101,7 +101,7 @@ public final class CharEffectList
* Constructor for effect list. * Constructor for effect list.
* @param owner the creature that owns this effect list * @param owner the creature that owns this effect list
*/ */
public CharEffectList(Creature owner) public EffectList(Creature owner)
{ {
_owner = owner; _owner = owner;
} }
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -59,7 +59,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TerritoryWarManager; import com.l2jmobius.gameserver.instancemanager.TerritoryWarManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.Party; import com.l2jmobius.gameserver.model.Party;
import com.l2jmobius.gameserver.model.PlayerCondOverride; import com.l2jmobius.gameserver.model.PlayerCondOverride;
@@ -235,7 +235,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, InvulSkillHolder> _invulAgainst; private volatile Map<Integer, InvulSkillHolder> _invulAgainst;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -358,7 +358,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -6232,7 +6232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
/** /**
* Check if target is affected with special buff * Check if target is affected with special buff
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
* @param flag int * @param flag int
* @return boolean * @return boolean
*/ */
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -221,7 +221,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/CharEffectList.java
-1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/EffectList.java
+1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4675,7 +4675,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -773,7 +773,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/CharEffectList.java
-1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/EffectList.java
+1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4675,7 +4675,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -773,7 +773,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/CharEffectList.java
-1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/EffectList.java
+1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4675,7 +4675,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -773,7 +773,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/CharEffectList.java
-1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/EffectList.java
+1178
View File
File diff suppressed because it is too large Load Diff
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/Creature.java
+4 -4
View File
@@ -68,7 +68,7 @@ import com.l2jmobius.gameserver.instancemanager.QuestManager;
import com.l2jmobius.gameserver.instancemanager.TimersManager; import com.l2jmobius.gameserver.instancemanager.TimersManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager; import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.AccessLevel; import com.l2jmobius.gameserver.model.AccessLevel;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.CreatureContainer; import com.l2jmobius.gameserver.model.CreatureContainer;
import com.l2jmobius.gameserver.model.Hit; import com.l2jmobius.gameserver.model.Hit;
import com.l2jmobius.gameserver.model.Location; import com.l2jmobius.gameserver.model.Location;
@@ -232,7 +232,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects; private volatile Map<Integer, IgnoreSkillHolder> _ignoreSkillEffects;
/** Creatures effect list. */ /** Creatures effect list. */
private final CharEffectList _effectList = new CharEffectList(this); private final EffectList _effectList = new EffectList(this);
/** The creature that summons this character. */ /** The creature that summons this character. */
private Creature _summoner = null; private Creature _summoner = null;
@@ -345,7 +345,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
setIsInvul(true); setIsInvul(true);
} }
public final CharEffectList getEffectList() public final EffectList getEffectList()
{ {
return _effectList; return _effectList;
} }
@@ -4675,7 +4675,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
* Check if target is affected with special buff * Check if target is affected with special buff
* @param flag int * @param flag int
* @return boolean * @return boolean
* @see CharEffectList#isAffected(EffectFlag) * @see EffectList#isAffected(EffectFlag)
*/ */
public boolean isAffected(EffectFlag flag) public boolean isAffected(EffectFlag flag)
{ {
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/actor/stat/CreatureStat.java
+2 -2
View File
@@ -36,7 +36,7 @@ import java.util.stream.Stream;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.AttributeType; import com.l2jmobius.gameserver.enums.AttributeType;
import com.l2jmobius.gameserver.enums.Position; import com.l2jmobius.gameserver.enums.Position;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.items.instance.ItemInstance; import com.l2jmobius.gameserver.model.items.instance.ItemInstance;
import com.l2jmobius.gameserver.model.skills.AbnormalType; import com.l2jmobius.gameserver.model.skills.AbnormalType;
@@ -773,7 +773,7 @@ public class CreatureStat
resetStats(); resetStats();
// Collect all necessary effects // Collect all necessary effects
final CharEffectList effectList = _creature.getEffectList(); final EffectList effectList = _creature.getEffectList();
final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature)); final Stream<BuffInfo> passives = effectList.getPassives().stream().filter(BuffInfo::isInUse).filter(info -> info.getSkill().checkConditions(SkillConditionScope.PASSIVE, _creature, _creature));
final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse); final Stream<BuffInfo> options = effectList.getOptions().stream().filter(BuffInfo::isInUse);
final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options)); final Stream<BuffInfo> effectsStream = Stream.concat(effectList.getEffects().stream().filter(BuffInfo::isInUse), Stream.concat(passives, options));
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/skills/BuffInfo.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.concurrent.ScheduledFuture;
import com.l2jmobius.Config; import com.l2jmobius.Config;
import com.l2jmobius.commons.concurrent.ThreadPool; import com.l2jmobius.commons.concurrent.ThreadPool;
import com.l2jmobius.gameserver.GameTimeController; import com.l2jmobius.gameserver.GameTimeController;
import com.l2jmobius.gameserver.model.CharEffectList; import com.l2jmobius.gameserver.model.EffectList;
import com.l2jmobius.gameserver.model.actor.Creature; import com.l2jmobius.gameserver.model.actor.Creature;
import com.l2jmobius.gameserver.model.actor.Summon; import com.l2jmobius.gameserver.model.actor.Summon;
import com.l2jmobius.gameserver.model.effects.AbstractEffect; import com.l2jmobius.gameserver.model.effects.AbstractEffect;
@@ -290,7 +290,7 @@ public final class BuffInfo
* Stops all the effects for this buff info.<br> * Stops all the effects for this buff info.<br>
* Removes effects stats.<br> * Removes effects stats.<br>
* <b>It will not remove the buff info from the effect list</b>.<br> * <b>It will not remove the buff info from the effect list</b>.<br>
* Instead call {@link CharEffectList#stopSkillEffects(boolean, Skill)} * Instead call {@link EffectList#stopSkillEffects(boolean, Skill)}
* @param removed if {@code true} the skill will be handled as removed * @param removed if {@code true} the skill will be handled as removed
*/ */
public void stopAllEffects(boolean removed) public void stopAllEffects(boolean removed)