From bd1fb2afbea335136477f3e73d108c12b1a3a688 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 31 Mar 2020 09:17:07 +0000 Subject: [PATCH] Remove buffs from skills that are blocked in olympiad. --- .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ .../gameserver/model/olympiad/AbstractOlympiadGame.java | 5 +++++ 15 files changed, 75 insertions(+) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index be3afdb7e4..6b4854123a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index be3afdb7e4..6b4854123a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index be3afdb7e4..6b4854123a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp()); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java index b03a67dd25..6a84d65c41 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java @@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame // Remove Buffs player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); // Remove Clan Skills if (player.getClan() != null) @@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame player.getServitors().values().forEach(s -> { s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); s.abortAttack(); s.abortCast(); }); @@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame } player.stopAllEffectsExceptThoseThatLastThroughDeath(); + player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); player.clearSouls(); player.clearCharges(); if (player.getAgathionId() > 0) @@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame pet.abortCast(); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.stopAllEffectsExceptThoseThatLastThroughDeath(); + pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); } player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> @@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame s.abortCast(); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.stopAllEffectsExceptThoseThatLastThroughDeath(); + s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true); }); player.setCurrentCp(player.getMaxCp());