diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 4bf47deed2..069ae71558 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -61,7 +61,6 @@ public class DisableSkill extends AbstractEffect effected.disableSkill(knownSKill, 0); } - effected.disableSkill(skill, 0); } } diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml index 51f8fdc9ae..1db34c4789 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/10000-10099.xml @@ -1317,7 +1317,7 @@ {base + 10 + 0.5 * subIndex} SIGEL_SHIELD - ULTIMATE_DEFENCE + RAISE_SHIELD;FOCUS_SHIELD 5 85 @@ -1573,6 +1573,7 @@ 10 SIGEL_SHIELD + FOCUS_SHIELD icon.skill10020 A2 NONE @@ -1634,6 +1635,7 @@ {base + 0.5 * subIndex} SIGEL_SHIELD + RAISE_SHIELD icon.skill10021 A2 5 diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index b404e03e9d..0e7d69e94f 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -8480,8 +8480,12 @@ public final class L2PcInstance extends L2Playable sm.addSkillName(skill); } - sendPacket(sm); - return false; + // Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active. + if (!(getEffectList().getBuffInfoBySkillId(10017) != null) && ((skill.getId() == 10020) || (skill.getId() == 10021))) + { + sendPacket(sm); + return false; + } } // Check if the caster is sitting diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java index 1e2397d924..b2e2aa6db5 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -542,7 +542,7 @@ public enum AbnormalType EARTHWORM_DEBUFF(424), INSIDE_POSITION(593), STEEL_MIND(596), - SIGEL_SHIELD(-1); + SIGEL_SHIELD(597); private int _clientId; diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java index 3a8640eab6..6c25b0cc91 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java @@ -230,8 +230,8 @@ public enum AbnormalVisualEffect IN_B_DECAL(231), CHANGESHAPE_TRANSFORM_6(232), CHANGESHAPE_TRANSFORM_7(234), - POWER_BLOCKING(247), - FOCUS_SHIELD(248), + FOCUS_SHIELD(247), + RAISE_SHIELD(248), TRUE_VANGUARD(249), SHIELD_WALL(250), DRAGON_ULTIMATE(700), diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java index 4bf47deed2..069ae71558 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/DisableSkill.java @@ -61,7 +61,6 @@ public class DisableSkill extends AbstractEffect effected.disableSkill(knownSKill, 0); } - effected.disableSkill(skill, 0); } } diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml index 51f8fdc9ae..1db34c4789 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/10000-10099.xml @@ -1317,7 +1317,7 @@ {base + 10 + 0.5 * subIndex} SIGEL_SHIELD - ULTIMATE_DEFENCE + RAISE_SHIELD;FOCUS_SHIELD 5 85 @@ -1573,6 +1573,7 @@ 10 SIGEL_SHIELD + FOCUS_SHIELD icon.skill10020 A2 NONE @@ -1634,6 +1635,7 @@ {base + 0.5 * subIndex} SIGEL_SHIELD + RAISE_SHIELD icon.skill10021 A2 5 diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java index f687f438e0..c4f5532c6d 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/actor/instance/L2PcInstance.java @@ -8480,8 +8480,12 @@ public final class L2PcInstance extends L2Playable sm.addSkillName(skill); } - sendPacket(sm); - return false; + // Don't send packet for Raise/Focus Shield if Final Ultimate Defense is active. + if (!(getEffectList().getBuffInfoBySkillId(10017) != null) && ((skill.getId() == 10020) || (skill.getId() == 10021))) + { + sendPacket(sm); + return false; + } } // Check if the caster is sitting diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java index 1e2397d924..b2e2aa6db5 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalType.java @@ -542,7 +542,7 @@ public enum AbnormalType EARTHWORM_DEBUFF(424), INSIDE_POSITION(593), STEEL_MIND(596), - SIGEL_SHIELD(-1); + SIGEL_SHIELD(597); private int _clientId; diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java index 3a8640eab6..6c25b0cc91 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/skills/AbnormalVisualEffect.java @@ -230,8 +230,8 @@ public enum AbnormalVisualEffect IN_B_DECAL(231), CHANGESHAPE_TRANSFORM_6(232), CHANGESHAPE_TRANSFORM_7(234), - POWER_BLOCKING(247), - FOCUS_SHIELD(248), + FOCUS_SHIELD(247), + RAISE_SHIELD(248), TRUE_VANGUARD(249), SHIELD_WALL(250), DRAGON_ULTIMATE(700),