diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java index 55bf3aeff4..17f000be05 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -83,6 +83,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -395,6 +397,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) { diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java index 55bf3aeff4..17f000be05 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -83,6 +83,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -395,6 +397,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) { diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java index 55bf3aeff4..17f000be05 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -83,6 +83,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -395,6 +397,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) { diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java index 60ffa748b6..d28c833c41 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) { diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java index 3b7f77e7c2..0677bb046d 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) { diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java index 3b7f77e7c2..0677bb046d 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) { diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java index 24c20fb84f..5e6be3afd5 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) { diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java index a146f7e778..c80b087dbc 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/dailymissionhandlers/LevelDailyMissionHandler.java @@ -25,6 +25,8 @@ import org.l2jmobius.gameserver.model.events.Containers; import org.l2jmobius.gameserver.model.events.EventType; import org.l2jmobius.gameserver.model.events.impl.creature.player.OnPlayerLevelChanged; import org.l2jmobius.gameserver.model.events.listeners.ConsumerEventListener; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** * @author Sdw @@ -94,6 +96,11 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler private void onPlayerLevelChanged(OnPlayerLevelChanged event) { final Player player = event.getPlayer(); + if (player.getClan() == null) + { + return; + } + if ((player.getLevel() >= _level) && (player.isDualClassActive() == _dualclass)) { final DailyMissionPlayerEntry entry = getPlayerEntry(player.getObjectId(), true); @@ -102,6 +109,8 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); } + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java index 24c20fb84f..5e6be3afd5 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -82,6 +82,8 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeSkillListAdd; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; import org.l2jmobius.gameserver.network.serverpackets.UserInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionInfo; +import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeShowInfoUpdate; import org.l2jmobius.gameserver.util.EnumIntBitmask; import org.l2jmobius.gameserver.util.Util; @@ -394,6 +396,8 @@ public class Clan implements IIdentifiable, INamable player.setPledgeClass(PLEDGE_CLASS_COMMON); player.sendPacket(new PledgeShowMemberListUpdate(player)); player.sendPacket(new PledgeSkillList(this)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); addSkillEffects(player); // Notify to scripts diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java index 1751e949df..ff317b67f6 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionInfo.java @@ -55,15 +55,19 @@ public class ExPledgeMissionInfo extends ServerPacket // TODO: Figure out this. if (reward.isLevelUpMission()) { - progress = 1; if (status == 2) { status = reward.getRequiredCompletions() > _player.getLevel() ? 1 : 3; } + else if ((status == 3) && (progress == 3)) + { + status = 0; + } else { status = reward.isRecentlyCompleted(_player) ? 0 : 3; } + progress = 1; } else if (status == 1) {