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

Remove buffs from skills that are blocked in olympiad.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-03-31 09:17:07 +00:00
parent 51e53be08f
commit bd1fb2afbe
15 changed files with 75 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());

5
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/olympiad/AbstractOlympiadGame.java
View File

@@ -203,6 +203,7 @@ public abstract class AbstractOlympiadGame
// Remove Buffs // Remove Buffs
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
// Remove Clan Skills // Remove Clan Skills
if (player.getClan() != null) if (player.getClan() != null)
@@ -241,6 +242,7 @@ public abstract class AbstractOlympiadGame
player.getServitors().values().forEach(s -> player.getServitors().values().forEach(s ->
{ {
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
s.abortAttack(); s.abortAttack();
s.abortCast(); s.abortCast();
}); });
@@ -308,6 +310,7 @@ public abstract class AbstractOlympiadGame
} }
player.stopAllEffectsExceptThoseThatLastThroughDeath(); player.stopAllEffectsExceptThoseThatLastThroughDeath();
player.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
player.clearSouls(); player.clearSouls();
player.clearCharges(); player.clearCharges();
if (player.getAgathionId() > 0) if (player.getAgathionId() > 0)
@@ -322,6 +325,7 @@ public abstract class AbstractOlympiadGame
pet.abortCast(); pet.abortCast();
pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); pet.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
pet.stopAllEffectsExceptThoseThatLastThroughDeath(); pet.stopAllEffectsExceptThoseThatLastThroughDeath();
pet.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
} }
player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s -> player.getServitors().values().stream().filter(s -> !s.isDead()).forEach(s ->
@@ -331,6 +335,7 @@ public abstract class AbstractOlympiadGame
s.abortCast(); s.abortCast();
s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE); s.getAI().setIntention(CtrlIntention.AI_INTENTION_IDLE);
s.stopAllEffectsExceptThoseThatLastThroughDeath(); s.stopAllEffectsExceptThoseThatLastThroughDeath();
s.getEffectList().stopEffects(info -> info.getSkill().isBlockedInOlympiad(), true, true);
}); });
player.setCurrentCp(player.getMaxCp()); player.setCurrentCp(player.getMaxCp());