Addition of ExPledgeMissionInfo constructor for single DailyMissionDataHolder.

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));
 		}
 	}
 }

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)
+ * @author Bonux
- * @date 29.09.2019
  */
 public class RequestExPledgeMissionInfo implements ClientPacket
 {
@@ -37,7 +36,7 @@ public class RequestExPledgeMissionInfo implements ClientPacket
 			return;
 		}
 		
-		client.sendPacket(new ExPledgeMissionRewardCount(player));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{

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
+ * @author Bonux, NasSeKa
- * @date 29.09.2019
+ */
- **/
 public class ExPledgeMissionRewardCount extends ServerPacket
 {
 	private final int _doneMissionsCount;

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));
 		}
 	}
 }

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));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{

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));
 		}
 	}
 }

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));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{

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));
 		}
 	}
 }

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));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{

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));
 		}
 	}
 }

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));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{

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));
 		}
 	}
 }

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));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{

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));
 		}
 	}
 }

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));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{

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));
 		}
 	}
 }

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));
+		player.sendPacket(new ExPledgeMissionInfo(player));
-		client.sendPacket(new ExPledgeMissionInfo(player));
+		player.sendPacket(new ExPledgeMissionRewardCount(player));
 	}
 }

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));
+			player.sendPacket(new ExPledgeMissionRewardCount(player));
-			client.sendPacket(new ExPledgeMissionInfo(player));
 		}
 		
 		ThreadPool.schedule(() -> player.removeRequest(RewardRequest.class), 300);

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()
 	{