Fixed daily mission icon count.

Contributed by ren.

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -251,6 +252,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -28,6 +28,7 @@ import org.l2jmobius.gameserver.network.Disconnection;
 import org.l2jmobius.gameserver.network.GameClient;
 import org.l2jmobius.gameserver.network.clientpackets.IClientIncomingPacket;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 
 /**
  * @author Sdw
@@ -74,6 +75,7 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
+		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
 		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
+import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 import org.l2jmobius.gameserver.util.Util;
 
 public class PlayerStat extends PlayableStat
@@ -250,6 +251,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExPledgeMissionRewardCount(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java

@@ -34,7 +34,7 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket
 	public ExPledgeMissionRewardCount(PlayerInstance player)
 	{
 		_doneMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getRecentlyCompleted(player)).count();
-		_availableMissionsCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_availableMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
+import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 import org.l2jmobius.gameserver.util.Util;
 
 public class PlayerStat extends PlayableStat
@@ -250,6 +251,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExPledgeMissionRewardCount(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java

@@ -34,7 +34,7 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket
 	public ExPledgeMissionRewardCount(PlayerInstance player)
 	{
 		_doneMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getRecentlyCompleted(player)).count();
-		_availableMissionsCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_availableMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
+import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 import org.l2jmobius.gameserver.util.Util;
 
 public class PlayerStat extends PlayableStat
@@ -250,6 +251,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExPledgeMissionRewardCount(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java

@@ -34,7 +34,7 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket
 	public ExPledgeMissionRewardCount(PlayerInstance player)
 	{
 		_doneMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getRecentlyCompleted(player)).count();
-		_availableMissionsCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_availableMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
+import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 import org.l2jmobius.gameserver.util.Util;
 
 public class PlayerStat extends PlayableStat
@@ -250,6 +251,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExPledgeMissionRewardCount(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java

@@ -34,7 +34,7 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket
 	public ExPledgeMissionRewardCount(PlayerInstance player)
 	{
 		_doneMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getRecentlyCompleted(player)).count();
-		_availableMissionsCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_availableMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
+import org.l2jmobius.gameserver.network.serverpackets.pledgeV2.ExPledgeMissionRewardCount;
 import org.l2jmobius.gameserver.util.Util;
 
 public class PlayerStat extends PlayableStat
@@ -250,6 +251,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExPledgeMissionRewardCount(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/network/serverpackets/pledgeV2/ExPledgeMissionRewardCount.java

@@ -34,7 +34,7 @@ public class ExPledgeMissionRewardCount implements IClientOutgoingPacket
 	public ExPledgeMissionRewardCount(PlayerInstance player)
 	{
 		_doneMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getRecentlyCompleted(player)).count();
-		_availableMissionsCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_availableMissionsCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -251,6 +252,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -75,8 +75,8 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
-		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
+		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->
 		{

L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -251,6 +252,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -75,8 +75,8 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
-		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
+		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->
 		{

L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -252,6 +253,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -75,8 +75,8 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
-		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
+		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->
 		{

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -252,6 +253,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -75,8 +75,8 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
-		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
+		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->
 		{

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -252,6 +253,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -75,8 +75,8 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
-		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
+		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->
 		{

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -44,6 +44,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -251,6 +252,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -75,8 +75,8 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
-		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
+		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->
 		{

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/stat/PlayerStat.java

@@ -45,6 +45,7 @@ import org.l2jmobius.gameserver.network.serverpackets.PledgeShowMemberListUpdate
 import org.l2jmobius.gameserver.network.serverpackets.SocialAction;
 import org.l2jmobius.gameserver.network.serverpackets.SystemMessage;
 import org.l2jmobius.gameserver.network.serverpackets.UserInfo;
+import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExConnectedTimeAndGettableReward;
 import org.l2jmobius.gameserver.network.serverpackets.dailymission.ExOneDayReceiveRewardList;
 import org.l2jmobius.gameserver.network.serverpackets.friend.FriendStatus;
 import org.l2jmobius.gameserver.util.Util;
@@ -252,6 +253,9 @@ public class PlayerStat extends PlayableStat
 		// Notify to scripts
 		EventDispatcher.getInstance().notifyEventAsync(new OnPlayerLevelChanged(getActiveChar(), getLevel() - value, getLevel()), getActiveChar());
 		
+		// Update daily mission count.
+		getActiveChar().sendPacket(new ExConnectedTimeAndGettableReward(getActiveChar()));
+		
 		// Give AutoGet skills and all normal skills if Auto-Learn is activated.
 		getActiveChar().rewardSkills();
 		

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/dailymission/RequestOneDayRewardReceive.java

@@ -75,8 +75,8 @@ public class RequestOneDayRewardReceive implements IClientIncomingPacket
 			}
 		}
 		
-		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		player.sendPacket(new ExOneDayReceiveRewardList(player, true));
+		player.sendPacket(new ExConnectedTimeAndGettableReward(player));
 		
 		ThreadPool.schedule(() ->
 		{

L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/dailymission/ExConnectedTimeAndGettableReward.java

@@ -23,7 +23,7 @@ import org.l2jmobius.gameserver.network.OutgoingPackets;
 import org.l2jmobius.gameserver.network.serverpackets.IClientOutgoingPacket;
 
 /**
- * @author Sdw
+ * @author Sdw, Ren
  */
 public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 {
@@ -31,7 +31,7 @@ public class ExConnectedTimeAndGettableReward implements IClientOutgoingPacket
 	
 	public ExConnectedTimeAndGettableReward(PlayerInstance player)
 	{
-		_oneDayRewardAvailableCount = DailyMissionData.getInstance().getDailyMissionData(player).size();
+		_oneDayRewardAvailableCount = (int) DailyMissionData.getInstance().getDailyMissionData(player).stream().filter(d -> d.getStatus(player) == 1).count();
 	}
 	
 	@Override