From 9532fd2d1ad8d72a36c93688829916fc90337d29 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 2 Oct 2022 05:55:18 +0000 Subject: [PATCH] Prohibit ResurrectionSpecial triggering in olympiad. --- .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 6 ++++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 6 ++++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 6 ++++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ .../handlers/effecthandlers/ResurrectionSpecial.java | 5 +++++ 27 files changed, 138 insertions(+) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 3857425ead..9f3e043ba0 100644 --- a/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_CT_0_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -59,6 +59,12 @@ public class ResurrectionSpecial extends AbstractEffect { return; } + + if (info.getEffected().getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = info.getEffector().getActingPlayer(); if (info.getEffected().isPlayer()) { diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 3857425ead..9f3e043ba0 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -59,6 +59,12 @@ public class ResurrectionSpecial extends AbstractEffect { return; } + + if (info.getEffected().getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = info.getEffector().getActingPlayer(); if (info.getEffected().isPlayer()) { diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 3857425ead..9f3e043ba0 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -59,6 +59,12 @@ public class ResurrectionSpecial extends AbstractEffect { return; } + + if (info.getEffected().getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = info.getEffector().getActingPlayer(); if (info.getEffected().isPlayer()) { diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId()))) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java index 14096d42b8..f7c6459e05 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/effecthandlers/ResurrectionSpecial.java @@ -84,6 +84,11 @@ public class ResurrectionSpecial extends AbstractEffect return; } + if (effected.getActingPlayer().isInOlympiadMode()) + { + return; + } + final Player caster = effector.getActingPlayer(); final Instance instance = caster.getInstanceWorld(); if (!_instanceId.isEmpty() && ((instance == null) || !_instanceId.contains(instance.getTemplateId())))