From 27f5e8581f15e701af98467104e02deba1b284ff Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 17 Jan 2021 02:46:17 +0000 Subject: [PATCH] Removed support for trigger skills. Contributed by Vinter. --- .../dist/game/config/Character.ini | 3 +- .../game/data/stats/skills/05100-05199.xml | 35 --- .../game/data/stats/skills/05200-05299.xml | 4 - .../game/data/stats/skills/05400-05499.xml | 14 -- .../game/data/stats/skills/05500-05599.xml | 25 --- .../game/data/stats/skills/05600-05699.xml | 39 ---- .../game/data/stats/skills/05900-05999.xml | 1 - .../game/data/stats/skills/06000-06099.xml | 5 - .../game/data/stats/skills/06100-06199.xml | 2 - .../game/data/stats/skills/23200-23299.xml | 2 - .../java/org/l2jmobius/Config.java | 2 - .../gameserver/model/EffectList.java | 203 +----------------- .../gameserver/model/skills/Skill.java | 7 - .../gameserver/model/stats/Formulas.java | 8 - 14 files changed, 5 insertions(+), 345 deletions(-) diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Character.ini b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Character.ini index e93e3b822e..1f74ee4ddf 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Character.ini +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Character.ini @@ -96,9 +96,8 @@ AutoLearnForgottenScrollSkills = False # Maximum number of buffs and songs/dances. # Remember that Divine Inspiration will give players 4 additional buff slots on top of the number specified in "maxbuffamount". -# Default: 20, 12, 12 +# Default: 20, 12 MaxBuffAmount = 20 -MaxTriggeredBuffAmount = 12 MaxDanceAmount = 12 # Allow players to cancel dances/songs via Alt+click on buff icon diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05100-05199.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05100-05199.xml index 25ea8a389a..276d18392e 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05100-05199.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05100-05199.xml @@ -78,7 +78,6 @@ - @@ -93,7 +92,6 @@ - @@ -108,7 +106,6 @@ - @@ -792,7 +789,6 @@ - @@ -835,7 +831,6 @@ - @@ -856,7 +851,6 @@ - @@ -877,7 +871,6 @@ - @@ -895,7 +888,6 @@ - @@ -916,7 +908,6 @@ - @@ -936,7 +927,6 @@ - @@ -954,7 +944,6 @@ - @@ -975,7 +964,6 @@ - @@ -996,7 +984,6 @@ - @@ -1017,7 +1004,6 @@ - @@ -1037,7 +1023,6 @@ - @@ -1059,7 +1044,6 @@ - @@ -1080,7 +1064,6 @@ - @@ -1104,7 +1087,6 @@ - @@ -1127,7 +1109,6 @@ - @@ -1148,7 +1129,6 @@ - @@ -1169,7 +1149,6 @@ - @@ -1190,7 +1169,6 @@ - @@ -1210,7 +1188,6 @@ - @@ -1235,7 +1212,6 @@ - @@ -1260,7 +1236,6 @@ - @@ -1286,7 +1261,6 @@ - @@ -1311,7 +1285,6 @@ - @@ -1339,7 +1312,6 @@ - @@ -1367,7 +1339,6 @@ - @@ -1394,7 +1365,6 @@ - @@ -1418,7 +1388,6 @@ - @@ -1449,7 +1418,6 @@ - @@ -1478,7 +1446,6 @@ - @@ -1506,7 +1473,6 @@ - @@ -1531,7 +1497,6 @@ - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05200-05299.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05200-05299.xml index 5156004a10..7cc3596c46 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05200-05299.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05200-05299.xml @@ -972,7 +972,6 @@ - @@ -1081,7 +1080,6 @@ - @@ -1173,7 +1171,6 @@ - @@ -1211,7 +1208,6 @@ 99 5
- diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05400-05499.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05400-05499.xml index 26485763ef..de86a17ad6 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05400-05499.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05400-05499.xml @@ -283,7 +283,6 @@ - @@ -300,7 +299,6 @@ - @@ -319,7 +317,6 @@ - @@ -339,7 +336,6 @@ - @@ -351,7 +347,6 @@ - @@ -366,7 +361,6 @@ - @@ -677,7 +671,6 @@ - @@ -688,7 +681,6 @@ - @@ -701,7 +693,6 @@ - @@ -718,7 +709,6 @@ - @@ -734,7 +724,6 @@ - @@ -753,7 +742,6 @@ - @@ -766,7 +754,6 @@ 68 70 72 74
148 153 157 162
- @@ -1211,7 +1198,6 @@ - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05500-05599.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05500-05599.xml index e39cbe0e4d..d0c3a2f8e2 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05500-05599.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05500-05599.xml @@ -364,7 +364,6 @@ - @@ -825,7 +824,6 @@ - @@ -843,7 +841,6 @@ 20 40 58 70
- @@ -907,7 +904,6 @@ - @@ -975,7 +971,6 @@ - @@ -1023,7 +1018,6 @@ - @@ -1060,7 +1054,6 @@ - @@ -1089,7 +1082,6 @@ - @@ -1119,7 +1111,6 @@ - @@ -1148,7 +1139,6 @@ - @@ -1177,7 +1167,6 @@ - @@ -1205,7 +1194,6 @@ - @@ -1226,7 +1214,6 @@ - @@ -1249,7 +1236,6 @@ - @@ -1267,7 +1253,6 @@ - @@ -1285,7 +1270,6 @@ - @@ -1307,7 +1291,6 @@ - @@ -1327,7 +1310,6 @@ - @@ -1348,7 +1330,6 @@ - @@ -1362,7 +1343,6 @@ - @@ -1383,7 +1363,6 @@ - @@ -1395,7 +1374,6 @@ - @@ -1415,7 +1393,6 @@ - @@ -1725,7 +1702,6 @@ 60 62 64 66 68 70 72 74
- @@ -1752,7 +1728,6 @@ - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05600-05699.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05600-05699.xml index 436d684c08..3daeda1d13 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05600-05699.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05600-05699.xml @@ -4,7 +4,6 @@ - @@ -42,7 +41,6 @@ - @@ -61,7 +59,6 @@ - @@ -79,7 +76,6 @@ - @@ -100,7 +96,6 @@ - @@ -124,7 +119,6 @@ - @@ -148,7 +142,6 @@ - @@ -1156,7 +1149,6 @@ - @@ -1177,7 +1169,6 @@ - @@ -1198,7 +1189,6 @@ - @@ -1220,7 +1210,6 @@ - @@ -1243,7 +1232,6 @@ - @@ -1264,7 +1252,6 @@ - @@ -1285,7 +1272,6 @@ - @@ -1306,7 +1292,6 @@ - @@ -1328,7 +1313,6 @@ - @@ -1346,7 +1330,6 @@ - @@ -1364,7 +1347,6 @@ - @@ -1376,7 +1358,6 @@ - @@ -1388,7 +1369,6 @@ - @@ -1400,7 +1380,6 @@ - @@ -1442,7 +1421,6 @@ - @@ -1454,7 +1432,6 @@ - @@ -1472,7 +1449,6 @@ - @@ -1495,7 +1471,6 @@ - @@ -1513,7 +1488,6 @@ - @@ -1534,7 +1508,6 @@ - @@ -1554,7 +1527,6 @@ - @@ -1577,7 +1549,6 @@ - @@ -1602,7 +1573,6 @@ - @@ -1627,7 +1597,6 @@ - @@ -1647,7 +1616,6 @@ - @@ -1669,7 +1637,6 @@ - @@ -1685,7 +1652,6 @@ - @@ -1708,7 +1674,6 @@ - @@ -1728,7 +1693,6 @@ - @@ -1741,7 +1705,6 @@ - @@ -1788,7 +1751,6 @@ - @@ -1804,7 +1766,6 @@ 40 48 56 60 64 68 72 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85
- diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05900-05999.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05900-05999.xml index bf9219ff3c..03c89372d3 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05900-05999.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/05900-05999.xml @@ -63,7 +63,6 @@ - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06000-06099.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06000-06099.xml index 6238893959..af6659b051 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06000-06099.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06000-06099.xml @@ -713,7 +713,6 @@ - @@ -733,7 +732,6 @@ - @@ -955,7 +953,6 @@ - @@ -975,7 +972,6 @@ - @@ -994,7 +990,6 @@ - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06100-06199.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06100-06199.xml index 75c1de574d..a01cc3cc31 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06100-06199.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/06100-06199.xml @@ -288,7 +288,6 @@ - @@ -306,7 +305,6 @@ - diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/23200-23299.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/23200-23299.xml index 3cbbe760ff..1ccf09f63a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/23200-23299.xml +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/stats/skills/23200-23299.xml @@ -8,7 +8,6 @@ - @@ -27,7 +26,6 @@ - diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java index a0f118f14b..40ab86f996 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/Config.java @@ -163,7 +163,6 @@ public class Config public static boolean AUTO_LEARN_FS_SKILLS; public static boolean AUTO_LOOT_HERBS; public static byte BUFFS_MAX_AMOUNT; - public static byte TRIGGERED_BUFFS_MAX_AMOUNT; public static byte DANCES_MAX_AMOUNT; public static boolean DANCE_CANCEL_BUFF; public static boolean DANCE_CONSUME_ADDITIONAL_MP; @@ -1746,7 +1745,6 @@ public class Config AUTO_LEARN_FS_SKILLS = Character.getBoolean("AutoLearnForgottenScrollSkills", false); AUTO_LOOT_HERBS = Character.getBoolean("AutoLootHerbs", false); BUFFS_MAX_AMOUNT = Character.getByte("MaxBuffAmount", (byte) 20); - TRIGGERED_BUFFS_MAX_AMOUNT = Character.getByte("MaxTriggeredBuffAmount", (byte) 12); DANCES_MAX_AMOUNT = Character.getByte("MaxDanceAmount", (byte) 12); DANCE_CANCEL_BUFF = Character.getBoolean("DanceCancelBuff", false); DANCE_CONSUME_ADDITIONAL_MP = Character.getBoolean("DanceConsumeAdditionalMP", true); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EffectList.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EffectList.java index f1da2bd7ec..75adbf4d2a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EffectList.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/EffectList.java @@ -62,8 +62,6 @@ public class EffectList private static final Logger LOGGER = Logger.getLogger(EffectList.class.getName()); /** Queue containing all effects from buffs for this effect list. */ private final Queue _buffs = new ConcurrentLinkedQueue<>(); - /** Queue containing all triggered skills for this effect list. */ - private final Queue _triggered = new ConcurrentLinkedQueue<>(); /** Queue containing all dances/songs for this effect list. */ private final Queue _dances = new ConcurrentLinkedQueue<>(); /** Queue containing all toggle for this effect list. */ @@ -113,15 +111,6 @@ public class EffectList return _buffs; } - /** - * Gets triggered skill skills. - * @return the triggered skill skills - */ - public Queue getTriggered() - { - return _triggered; - } - /** * Gets dance/song skills. * @return the dance/song skills @@ -175,11 +164,6 @@ public class EffectList buffs.addAll(_buffs); } - if (hasTriggered()) - { - buffs.addAll(_triggered); - } - if (hasDances()) { buffs.addAll(_dances); @@ -218,10 +202,6 @@ public class EffectList { effects = _debuffs; } - else if (skill.isTriggeredSkill()) - { - effects = _triggered; - } else if (skill.isDance()) { effects = _dances; @@ -263,23 +243,6 @@ public class EffectList } } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if (info != null) - { - for (AbstractEffect effect : info.getEffects()) - { - if ((effect != null) && (effect.getEffectType() == type)) - { - return info; - } - } - } - } - } - if (hasDances()) { for (BuffInfo info : _dances) @@ -366,18 +329,6 @@ public class EffectList } } - if (hasTriggered() && (info == null)) - { - for (BuffInfo b : _triggered) - { - if (b.getSkill().getId() == skillId) - { - info = b; - break; - } - } - } - if (hasDances() && (info == null)) { for (BuffInfo b : _dances) @@ -540,17 +491,7 @@ public class EffectList { return hasDances() ? _dances.size() : 0; } - - /** - * Gets the triggered buffs count.
- * Prevents initialization. - * @return the number of triggered buffs in this creature effect list - */ - public int getTriggeredBuffCount() - { - return hasTriggered() ? _triggered.size() : 0; - } - + /** * Gets the hidden buff count. * @return the number of hidden buffs @@ -641,7 +582,7 @@ public class EffectList public void stopAllEffects() { // Stop buffs. - stopAllBuffs(false, true); + stopAllBuffs(false); // Stop dances and songs. stopAllDances(false); // Stop toggles. @@ -674,18 +615,6 @@ public class EffectList update = true; } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if (!info.getSkill().isStayAfterDeath()) - { - stopAndRemove(true, info, _triggered); - } - } - update = true; - } - if (hasDebuffs()) { for (BuffInfo info : _debuffs) @@ -738,10 +667,6 @@ public class EffectList { stopAndRemove(broadcast, info, _buffs); } - for (BuffInfo info : _triggered) - { - stopAndRemove(broadcast, info, _triggered); - } for (BuffInfo info : _dances) { stopAndRemove(broadcast, info, _dances); @@ -784,18 +709,6 @@ public class EffectList update = true; } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if (!info.getSkill().isStayOnSubclassChange()) - { - stopAndRemove(true, info, _triggered); - } - } - update = true; - } - if (hasDebuffs()) { for (BuffInfo info : _debuffs) @@ -839,20 +752,14 @@ public class EffectList /** * Stops all the active buffs. * @param update set to true to update the effect flags and icons - * @param triggered if {@code true} stops triggered skills buffs */ - public void stopAllBuffs(boolean update, boolean triggered) + public void stopAllBuffs(boolean update) { if (hasBuffs()) { _buffs.forEach(b -> stopAndRemove(update, b, _buffs)); } - if (triggered && hasTriggered()) - { - _triggered.forEach(b -> stopAndRemove(update, b, _triggered)); - } - // Update effect flags and icons. updateEffectList(update); } @@ -942,18 +849,6 @@ public class EffectList update = true; } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if (info != null) - { - action.accept(info); - } - } - update = true; - } - if (hasDances()) { for (BuffInfo info : _dances) @@ -1079,18 +974,6 @@ public class EffectList update = true; } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if (info.getSkill().isRemovedOnAnyActionExceptMove()) - { - stopAndRemove(true, info, _triggered); - } - } - update = true; - } - if (hasDebuffs()) { for (BuffInfo info : _debuffs) @@ -1153,18 +1036,6 @@ public class EffectList update = true; } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if ((info != null) && info.getSkill().isRemovedOnDamage()) - { - stopAndRemove(true, info, _triggered); - } - } - update = true; - } - if (hasDances()) { for (BuffInfo info : _dances) @@ -1226,7 +1097,7 @@ public class EffectList */ public boolean isEmpty() { - return !hasBuffs() && !hasTriggered() && !hasDances() && !hasDebuffs() && !hasToggles(); + return !hasBuffs() && !hasDances() && !hasDebuffs() && !hasToggles(); } /** @@ -1239,16 +1110,6 @@ public class EffectList return !_buffs.isEmpty(); } - /** - * Verify if this effect list has triggered skills.
- * Prevents initialization. - * @return {@code true} if {@link #_triggered} is not {@code null} and is not empty - */ - public boolean hasTriggered() - { - return !_triggered.isEmpty(); - } - /** * Verify if this effect list has dance/song skills.
* Prevents initialization. @@ -1306,14 +1167,6 @@ public class EffectList } } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - update |= function.apply(info); - } - } - if (dances && hasDances()) { for (BuffInfo info : _dances) @@ -1482,10 +1335,6 @@ public class EffectList { buffsToRemove = getDanceCount() - Config.DANCES_MAX_AMOUNT; } - else if (skill.isTriggeredSkill()) - { - buffsToRemove = getTriggeredBuffCount() - Config.TRIGGERED_BUFFS_MAX_AMOUNT; - } else if (!skill.isHealingPotionSkill()) { buffsToRemove = getBuffCount() - _owner.getStat().getMaxBuffCount(); @@ -1593,15 +1442,6 @@ public class EffectList } } - // Triggered buffs. - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - addIcon(info, asu, ps, psSummon, os, isSummon); - } - } - // Songs and dances. if (hasDances()) { @@ -1747,27 +1587,6 @@ public class EffectList } } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if (info == null) - { - continue; - } - - if (info.getSkill().isRemovedOnAnyActionExceptMove()) - { - _hasBuffsRemovedOnAnyAction = true; - } - - if (info.getSkill().isRemovedOnDamage()) - { - _hasBuffsRemovedOnDamage = true; - } - } - } - if (hasToggles()) { for (BuffInfo info : _toggles) @@ -1822,20 +1641,6 @@ public class EffectList } } - if (hasTriggered()) - { - for (BuffInfo info : _triggered) - { - if (info != null) - { - for (AbstractEffect e : info.getEffects()) - { - flags |= e.getEffectFlags(); - } - } - } - } - if (hasDebuffs()) { for (BuffInfo info : _debuffs) diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java index 0119ffe7d9..dda0c01a75 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -174,7 +174,6 @@ public class Skill implements IIdentifiable private final int _baseCritRate; // percent of success for skill critical hit (especially for PhysicalAttack & Blow - they're not affected by rCrit values or buffs). private final boolean _directHpDmg; // If true then damage is being make directly - private final boolean _isTriggeredSkill; // If true the skill will take activation buff slot instead of a normal buff slot private final int _effectPoint; // Condition lists private List _preCondition; @@ -316,7 +315,6 @@ public class Skill implements IIdentifiable _isClanSkill = SkillTreeData.getInstance().isClanSkill(_id, _level); _baseCritRate = set.getInt("baseCritRate", 0); _directHpDmg = set.getBoolean("dmgDirectlyToHp", false); - _isTriggeredSkill = set.getBoolean("isTriggeredSkill", false); _effectPoint = set.getInt("effectPoint", 0); _flyType = set.getEnum("flyType", FlyType.class, null); _flyRadius = set.getInt("flyRadius", 0); @@ -841,11 +839,6 @@ public class Skill implements IIdentifiable return (_operateType != null) && _operateType.isChanneling(); } - public boolean isTriggeredSkill() - { - return _isTriggeredSkill; - } - /** * Verify if the skill is a transformation skill. * @return {@code true} if the skill is a transformation, {@code false} otherwise diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java index ad942ee7cf..17c909c84a 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/stats/Formulas.java @@ -1864,10 +1864,6 @@ public class Formulas // Prevent initialization. final List buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1); - if (target.getEffectList().hasTriggered()) - { - buffs.addAll(target.getEffectList().getTriggered()); - } if (target.getEffectList().hasDances()) { buffs.addAll(target.getEffectList().getDances()); @@ -1901,10 +1897,6 @@ public class Formulas // Prevent initialization. final List buffs = target.getEffectList().hasBuffs() ? new ArrayList<>(target.getEffectList().getBuffs()) : new ArrayList<>(1); - if (target.getEffectList().hasTriggered()) - { - buffs.addAll(target.getEffectList().getTriggered()); - } if (target.getEffectList().hasDances()) { buffs.addAll(target.getEffectList().getDances());