diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/Clan/Clan.java index 3509c2d4f6..7eaf35bf46 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/village_master/Clan/Clan.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerClanL import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; -import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import ai.AbstractNpcAI; @@ -40,8 +40,6 @@ import ai.AbstractNpcAI; */ public final class Clan extends AbstractNpcAI { - private final SkillHolder CLAN_ADVENT = new SkillHolder(19009, 1); - // @formatter:off private static final int[] NPCS = { @@ -112,13 +110,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); } }); } else if ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -134,13 +132,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - member.getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + member.getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } }); } if (activeChar.getClan() != null) { - activeChar.getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + activeChar.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } } @@ -151,7 +149,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isClanLeader() || ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline())) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -162,7 +160,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar().getPlayerInstance(); if (activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -170,7 +168,7 @@ public final class Clan extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerClanLeft(OnPlayerClanLeft event) { - event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } public static void main(String[] args) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java index 79f61e5c5c..7c8a94bb83 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -59,6 +59,7 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.ClanVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -499,8 +500,10 @@ public class L2Clan implements IIdentifiable, INamable SiegeManager.getInstance().removeSiegeSkills(player); player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } + // remove Clan skills from Player removeSkillEffects(player); + player.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); // remove Residential skills if (player.getClan().getCastleId() > 0) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java index 08d96565eb..77c53527e9 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java @@ -53,6 +53,7 @@ public enum CommonSkill IMPRIT_OF_DARKNESS(19035, 1), ABILITY_OF_LIGHT(19032, 1), ABILITY_OF_DARKNESS(19033, 1), + CLAN_ADVENT(19009, 1), HAIR_ACCESSORY_SET(17192, 1), ALCHEMY_CUBE(17943, 1), ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1), diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/Clan/Clan.java index 3509c2d4f6..7eaf35bf46 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/village_master/Clan/Clan.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerClanL import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; -import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import ai.AbstractNpcAI; @@ -40,8 +40,6 @@ import ai.AbstractNpcAI; */ public final class Clan extends AbstractNpcAI { - private final SkillHolder CLAN_ADVENT = new SkillHolder(19009, 1); - // @formatter:off private static final int[] NPCS = { @@ -112,13 +110,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); } }); } else if ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -134,13 +132,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - member.getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + member.getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } }); } if (activeChar.getClan() != null) { - activeChar.getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + activeChar.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } } @@ -151,7 +149,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isClanLeader() || ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline())) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -162,7 +160,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar().getPlayerInstance(); if (activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -170,7 +168,7 @@ public final class Clan extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerClanLeft(OnPlayerClanLeft event) { - event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } public static void main(String[] args) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java index a19a506072..7733a32091 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -59,6 +59,7 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.ClanVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -500,8 +501,10 @@ public class L2Clan implements IIdentifiable, INamable SiegeManager.getInstance().removeSiegeSkills(player); player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } + // remove Clan skills from Player removeSkillEffects(player); + player.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); // remove Residential skills if (player.getClan().getCastleId() > 0) diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java index 08d96565eb..77c53527e9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java @@ -53,6 +53,7 @@ public enum CommonSkill IMPRIT_OF_DARKNESS(19035, 1), ABILITY_OF_LIGHT(19032, 1), ABILITY_OF_DARKNESS(19033, 1), + CLAN_ADVENT(19009, 1), HAIR_ACCESSORY_SET(17192, 1), ALCHEMY_CUBE(17943, 1), ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1), diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/Clan/Clan.java index 3509c2d4f6..7eaf35bf46 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/village_master/Clan/Clan.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerClanL import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; -import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import ai.AbstractNpcAI; @@ -40,8 +40,6 @@ import ai.AbstractNpcAI; */ public final class Clan extends AbstractNpcAI { - private final SkillHolder CLAN_ADVENT = new SkillHolder(19009, 1); - // @formatter:off private static final int[] NPCS = { @@ -112,13 +110,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); } }); } else if ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -134,13 +132,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - member.getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + member.getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } }); } if (activeChar.getClan() != null) { - activeChar.getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + activeChar.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } } @@ -151,7 +149,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isClanLeader() || ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline())) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -162,7 +160,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar().getPlayerInstance(); if (activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -170,7 +168,7 @@ public final class Clan extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerClanLeft(OnPlayerClanLeft event) { - event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } public static void main(String[] args) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java index a19a506072..7733a32091 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -59,6 +59,7 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.ClanVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -500,8 +501,10 @@ public class L2Clan implements IIdentifiable, INamable SiegeManager.getInstance().removeSiegeSkills(player); player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } + // remove Clan skills from Player removeSkillEffects(player); + player.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); // remove Residential skills if (player.getClan().getCastleId() > 0) diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java index 08d96565eb..77c53527e9 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java @@ -53,6 +53,7 @@ public enum CommonSkill IMPRIT_OF_DARKNESS(19035, 1), ABILITY_OF_LIGHT(19032, 1), ABILITY_OF_DARKNESS(19033, 1), + CLAN_ADVENT(19009, 1), HAIR_ACCESSORY_SET(17192, 1), ALCHEMY_CUBE(17943, 1), ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1), diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/Clan/Clan.java index 3509c2d4f6..7eaf35bf46 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/village_master/Clan/Clan.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerClanL import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; -import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import ai.AbstractNpcAI; @@ -40,8 +40,6 @@ import ai.AbstractNpcAI; */ public final class Clan extends AbstractNpcAI { - private final SkillHolder CLAN_ADVENT = new SkillHolder(19009, 1); - // @formatter:off private static final int[] NPCS = { @@ -112,13 +110,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); } }); } else if ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -134,13 +132,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - member.getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + member.getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } }); } if (activeChar.getClan() != null) { - activeChar.getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + activeChar.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } } @@ -151,7 +149,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isClanLeader() || ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline())) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -162,7 +160,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar().getPlayerInstance(); if (activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -170,7 +168,7 @@ public final class Clan extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerClanLeft(OnPlayerClanLeft event) { - event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } public static void main(String[] args) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java index a19a506072..7733a32091 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -59,6 +59,7 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.ClanVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -500,8 +501,10 @@ public class L2Clan implements IIdentifiable, INamable SiegeManager.getInstance().removeSiegeSkills(player); player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } + // remove Clan skills from Player removeSkillEffects(player); + player.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); // remove Residential skills if (player.getClan().getCastleId() > 0) diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java index 08d96565eb..77c53527e9 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java @@ -53,6 +53,7 @@ public enum CommonSkill IMPRIT_OF_DARKNESS(19035, 1), ABILITY_OF_LIGHT(19032, 1), ABILITY_OF_DARKNESS(19033, 1), + CLAN_ADVENT(19009, 1), HAIR_ACCESSORY_SET(17192, 1), ALCHEMY_CUBE(17943, 1), ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1), diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/Clan/Clan.java index a13aaac231..d3f15b1b72 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/village_master/Clan/Clan.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerClanL import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; -import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import ai.AbstractNpcAI; @@ -40,8 +40,6 @@ import ai.AbstractNpcAI; */ public final class Clan extends AbstractNpcAI { - private final SkillHolder CLAN_ADVENT = new SkillHolder(19009, 1); - // @formatter:off private static final int[] NPCS = { @@ -106,13 +104,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); } }); } else if ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -128,13 +126,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - member.getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + member.getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } }); } if (activeChar.getClan() != null) { - activeChar.getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + activeChar.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } } @@ -145,7 +143,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isClanLeader() || ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline())) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -156,7 +154,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar().getPlayerInstance(); if (activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -164,7 +162,7 @@ public final class Clan extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerClanLeft(OnPlayerClanLeft event) { - event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } public static void main(String[] args) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java index d432250001..03f440a3fd 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -59,6 +59,7 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.ClanVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -500,8 +501,10 @@ public class L2Clan implements IIdentifiable, INamable SiegeManager.getInstance().removeSiegeSkills(player); player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } + // remove Clan skills from Player removeSkillEffects(player); + player.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); // remove Residential skills if (player.getClan().getCastleId() > 0) diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java index 20f2a40d40..baf4e3fa6c 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java @@ -52,6 +52,7 @@ public enum CommonSkill IMPRIT_OF_DARKNESS(19035, 1), ABILITY_OF_LIGHT(19032, 1), ABILITY_OF_DARKNESS(19033, 1), + CLAN_ADVENT(19009, 1), HAIR_ACCESSORY_SET(17192, 1), ALCHEMY_CUBE(17943, 1), ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1), diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/Clan/Clan.java index a13aaac231..d3f15b1b72 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/village_master/Clan/Clan.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerClanL import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; -import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import ai.AbstractNpcAI; @@ -40,8 +40,6 @@ import ai.AbstractNpcAI; */ public final class Clan extends AbstractNpcAI { - private final SkillHolder CLAN_ADVENT = new SkillHolder(19009, 1); - // @formatter:off private static final int[] NPCS = { @@ -106,13 +104,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); } }); } else if ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -128,13 +126,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - member.getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + member.getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } }); } if (activeChar.getClan() != null) { - activeChar.getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + activeChar.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } } @@ -145,7 +143,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isClanLeader() || ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline())) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -156,7 +154,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar().getPlayerInstance(); if (activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -164,7 +162,7 @@ public final class Clan extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerClanLeft(OnPlayerClanLeft event) { - event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } public static void main(String[] args) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java index 02322037c9..a1072abca6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -59,6 +59,7 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.ClanVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -500,8 +501,10 @@ public class L2Clan implements IIdentifiable, INamable SiegeManager.getInstance().removeSiegeSkills(player); player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } + // remove Clan skills from Player removeSkillEffects(player); + player.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); // remove Residential skills if (player.getClan().getCastleId() > 0) diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java index 20f2a40d40..baf4e3fa6c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java @@ -52,6 +52,7 @@ public enum CommonSkill IMPRIT_OF_DARKNESS(19035, 1), ABILITY_OF_LIGHT(19032, 1), ABILITY_OF_DARKNESS(19033, 1), + CLAN_ADVENT(19009, 1), HAIR_ACCESSORY_SET(17192, 1), ALCHEMY_CUBE(17943, 1), ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1), diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/Clan/Clan.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/Clan/Clan.java index a13aaac231..d3f15b1b72 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/Clan/Clan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/village_master/Clan/Clan.java @@ -31,7 +31,7 @@ import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerClanL import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogin; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerLogout; import com.l2jmobius.gameserver.model.events.impl.character.player.OnPlayerProfessionChange; -import com.l2jmobius.gameserver.model.holders.SkillHolder; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import ai.AbstractNpcAI; @@ -40,8 +40,6 @@ import ai.AbstractNpcAI; */ public final class Clan extends AbstractNpcAI { - private final SkillHolder CLAN_ADVENT = new SkillHolder(19009, 1); - // @formatter:off private static final int[] NPCS = { @@ -106,13 +104,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(member.getPlayerInstance(), member.getPlayerInstance()); } }); } else if ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -128,13 +126,13 @@ public final class Clan extends AbstractNpcAI { if (member.isOnline()) { - member.getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + member.getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } }); } if (activeChar.getClan() != null) { - activeChar.getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + activeChar.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } } @@ -145,7 +143,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar(); if (activeChar.isClanLeader() || ((activeChar.getClan() != null) && activeChar.getClan().getLeader().isOnline())) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -156,7 +154,7 @@ public final class Clan extends AbstractNpcAI final L2PcInstance activeChar = event.getActiveChar().getPlayerInstance(); if (activeChar.getClan().getLeader().isOnline()) { - CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); + CommonSkill.CLAN_ADVENT.getSkill().applyEffects(activeChar, activeChar); } } @@ -164,7 +162,7 @@ public final class Clan extends AbstractNpcAI @RegisterType(ListenerRegisterType.GLOBAL_PLAYERS) public void onPlayerClanLeft(OnPlayerClanLeft event) { - event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CLAN_ADVENT.getSkill()); + event.getActiveChar().getPlayerInstance().getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); } public static void main(String[] args) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java index e3a4a149ea..be44951dc0 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2Clan.java @@ -59,6 +59,7 @@ import com.l2jmobius.gameserver.model.interfaces.INamable; import com.l2jmobius.gameserver.model.itemcontainer.ClanWarehouse; import com.l2jmobius.gameserver.model.itemcontainer.ItemContainer; import com.l2jmobius.gameserver.model.pledge.ClanRewardBonus; +import com.l2jmobius.gameserver.model.skills.CommonSkill; import com.l2jmobius.gameserver.model.skills.Skill; import com.l2jmobius.gameserver.model.variables.ClanVariables; import com.l2jmobius.gameserver.model.zone.ZoneId; @@ -500,8 +501,10 @@ public class L2Clan implements IIdentifiable, INamable SiegeManager.getInstance().removeSiegeSkills(player); player.setClanCreateExpiryTime(System.currentTimeMillis() + (Config.ALT_CLAN_CREATE_DAYS * 86400000)); // 24*60*60*1000 = 86400000 } + // remove Clan skills from Player removeSkillEffects(player); + player.getEffectList().stopSkillEffects(true, CommonSkill.CLAN_ADVENT.getId()); // remove Residential skills if (player.getClan().getCastleId() > 0) diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java index 20f2a40d40..baf4e3fa6c 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/skills/CommonSkill.java @@ -52,6 +52,7 @@ public enum CommonSkill IMPRIT_OF_DARKNESS(19035, 1), ABILITY_OF_LIGHT(19032, 1), ABILITY_OF_DARKNESS(19033, 1), + CLAN_ADVENT(19009, 1), HAIR_ACCESSORY_SET(17192, 1), ALCHEMY_CUBE(17943, 1), ALCHEMY_CUBE_RANDOM_SUCCESS(17966, 1),