From bc406176afdfa9a51dd5f52ce5f1b4002969101f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 13 Jan 2023 02:00:16 +0000 Subject: [PATCH] Addition of ExPledgeMissionInfo constructor for single DailyMissionDataHolder. --- .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 7 +++---- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ .../serverpackets/pledgeV2/ExPledgeMissionRewardCount.java | 5 ++--- .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 4 ++-- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 4 ++-- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 4 ++-- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 4 ++-- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 4 ++-- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 4 ++-- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ .../dailymissionhandlers/LevelDailyMissionHandler.java | 5 +++-- .../clientpackets/pledgeV2/RequestExPledgeMissionInfo.java | 4 ++-- .../pledgeV2/RequestExPledgeMissionReward.java | 4 ++-- .../serverpackets/pledgeV2/ExPledgeMissionInfo.java | 7 +++++++ 33 files changed, 115 insertions(+), 53 deletions(-) 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index 9feb0f3b23..687707ff05 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -23,8 +23,7 @@ import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionIn import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount; /** - * @author Bonux (bonuxq@gmail.com) - * @date 29.09.2019 + * @author Bonux */ public class RequestExPledgeMissionInfo implements ClientPacket { @@ -37,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() { diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java index 1414be40bc..09a9234241 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java @@ -22,9 +22,8 @@ import org.l2jmobius.gameserver.network.ServerPackets; import org.l2jmobius.gameserver.network.serverpackets.ServerPacket; /** - * @author Bonux (bonuxq@gmail.com), NasSeKa - * @date 29.09.2019 - **/ + * @author Bonux, NasSeKa + */ public class ExPledgeMissionRewardCount extends ServerPacket { private final int _doneMissionsCount; 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index ee12e0a937..687707ff05 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() { 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index ee12e0a937..687707ff05 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() { 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index ee12e0a937..687707ff05 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() { 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index ee12e0a937..687707ff05 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() { 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index ee12e0a937..687707ff05 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() { 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index ee12e0a937..687707ff05 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() { 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 c80b087dbc..19ec0b07d5 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 @@ -108,9 +108,10 @@ public class LevelDailyMissionHandler extends AbstractDailyMissionHandler { entry.setStatus(DailyMissionStatus.AVAILABLE); storePlayerEntry(entry); + + player.sendPacket(new ExPledgeMissionInfo(player, getHolder())); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } - player.sendPacket(new ExPledgeMissionRewardCount(player)); - player.sendPacket(new ExPledgeMissionInfo(player)); } } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java index ee12e0a937..687707ff05 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionInfo.java @@ -36,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket return; } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java index 43983f4c70..b101d3dc89 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/pledgeV2/RequestExPledgeMissionReward.java @@ -70,10 +70,10 @@ public class RequestExPledgeMissionReward implements ClientPacket if (holder.isDisplayable(player)) { holder.requestReward(player); + player.sendPacket(new ExPledgeMissionInfo(player, holder)); } } - client.sendPacket(new ExPledgeMissionRewardCount(player)); - client.sendPacket(new ExPledgeMissionInfo(player)); + player.sendPacket(new ExPledgeMissionRewardCount(player)); } ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300); 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 ff317b67f6..7bfb795b23 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 @@ -17,6 +17,7 @@ package org.l2jmobius.gameserver.network.serverpackets.pledgeV2; import java.util.Collection; +import java.util.Collections; import org.l2jmobius.gameserver.data.xml.DailyMissionData; import org.l2jmobius.gameserver.model.DailyMissionDataHolder; @@ -38,6 +39,12 @@ public class ExPledgeMissionInfo extends ServerPacket _rewards = DailyMissionData.getInstance().getDailyMissionData(player); } + public ExPledgeMissionInfo(Player player, DailyMissionDataHolder holder) + { + _player = player; + _rewards = Collections.singletonList(holder); + } + @Override public void write() {