diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java index a7c06e2bd8..5cefe6ba62 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9953,6 +9953,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java index b8e12d033b..8fe649ca8e 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9956,6 +9956,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java index f1c46987ae..9ec9cd4d22 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9958,6 +9958,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java index 92c7d6bc51..4d8153fd2d 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9972,6 +9972,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java index 1899404228..3e55dd3bd4 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9997,6 +9997,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java index d413e10b35..192a4ae267 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10010,6 +10010,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java index bf9afec05e..2c35767dcb 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10016,6 +10016,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java index 09b516eb09..3f928184ac 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10052,6 +10052,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java index 9cbfaa3a27..d3f5a63488 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10189,6 +10189,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java index a1921a91d9..800aa95e9f 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10215,6 +10215,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java index 415be7ef81..0d408de556 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10287,6 +10287,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 95aeedde08..7f38eec95f 100644 --- a/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9835,8 +9835,8 @@ public class Player extends Playable stopAllEffectsExceptThoseThatLastThroughDeath(); stopAllEffectsNotStayOnSubclassChange(); + getEffectList().stopAllToggles(); stopCubics(); - restoreRecipeBook(false); // Restore any Death Penalty Buff diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java index 9b118c5618..38f4398eb7 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10377,8 +10377,8 @@ public class Player extends Playable stopAllEffectsExceptThoseThatLastThroughDeath(); stopAllEffectsNotStayOnSubclassChange(); + getEffectList().stopAllToggles(); stopCubics(); - restoreRecipeBook(false); // Restore any Death Penalty Buff diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java index 2af0df384f..6c5737442e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10260,8 +10260,8 @@ public class Player extends Playable stopAllEffectsExceptThoseThatLastThroughDeath(); stopAllEffectsNotStayOnSubclassChange(); + getEffectList().stopAllToggles(); stopCubics(); - restoreRecipeBook(false); // Restore any Death Penalty Buff diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java index 054fa31e3a..48072fc436 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9848,6 +9848,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java index b0fba2d6df..b6dc883fde 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9859,6 +9859,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index b0fba2d6df..b6dc883fde 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9859,6 +9859,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java index a2d88ef02a..5bd64d11c6 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9859,6 +9859,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java index c0758494c7..df69b2949e 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9845,6 +9845,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java index 203372ce51..5a58b237c0 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9888,6 +9888,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java index 51d39eeb70..83f5ceec34 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9943,6 +9943,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java index 3db2275874..657a3c52a4 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9888,6 +9888,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java index 1245a9ad10..c7b95fb7aa 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9848,6 +9848,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java index 03645da001..6f80e800da 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -9844,6 +9844,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java index 99c5f162c8..c91646c672 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10022,6 +10022,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java index bdc8a09a9d..9a17929089 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10077,6 +10077,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics(); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java index 48e5b49d54..1a855cc06d 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Player.java @@ -10297,6 +10297,9 @@ public class Player extends Playable // stopAllEffects(); getEffectList().stopEffects(info -> !info.getSkill().isNecessaryToggle() && !info.getSkill().isIrreplacableBuff(), true, false); + // In controversy with isNecessaryToggle above, new class rewarded skills should be rewarded bellow. + getEffectList().stopAllToggles(); + // Update abnormal visual effects. sendPacket(new ExUserInfoAbnormalVisualEffect(this)); stopCubics();