Removed stream usage from DailyMissionData.

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -35,12 +35,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -53,7 +55,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -98,23 +108,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -36,12 +36,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -54,7 +56,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -103,23 +113,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/data/xml/DailyMissionData.java

@@ -20,10 +20,10 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
-import java.util.stream.Collectors;
 
 import org.w3c.dom.Document;
 
@@ -36,12 +36,14 @@ import org.l2jmobius.gameserver.model.actor.Player;
 import org.l2jmobius.gameserver.model.holders.ItemHolder;
 
 /**
- * @author Sdw
+ * @author Sdw, Mobius
  */
 public class DailyMissionData implements IXmlReader
 {
 	private static final Logger LOGGER = Logger.getLogger(DailyMissionData.class.getName());
+	
 	private final Map<Integer, List<DailyMissionDataHolder>> _dailyMissionRewards = new LinkedHashMap<>();
+	private final List<DailyMissionDataHolder> _dailyMissionData = new ArrayList<>();
 	private boolean _isAvailable;
 	
 	protected DailyMissionData()
@@ -54,7 +56,15 @@ public class DailyMissionData implements IXmlReader
 	{
 		_dailyMissionRewards.clear();
 		parseDatapackFile("data/DailyMission.xml");
+		
+		_dailyMissionData.clear();
+		for (List<DailyMissionDataHolder> missionList : _dailyMissionRewards.values())
+		{
+			_dailyMissionData.addAll(missionList);
+		}
+		
 		_isAvailable = !_dailyMissionRewards.isEmpty();
+		
 		LOGGER.info(getClass().getSimpleName() + ": Loaded " + _dailyMissionRewards.size() + " one day rewards.");
 	}
 	
@@ -103,23 +113,20 @@ public class DailyMissionData implements IXmlReader
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData()
 	{
-		//@formatter:off
+		return _dailyMissionData;
-		return _dailyMissionRewards.values()
-			.stream()
-			.flatMap(List::stream)
-			.collect(Collectors.toList());
-		//@formatter:on
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(Player player)
 	{
-		//@formatter:off
+		final List<DailyMissionDataHolder> missionData = new LinkedList<>();
-		return _dailyMissionRewards.values()
+		for (DailyMissionDataHolder mission : _dailyMissionData)
-			.stream()
+		{
-			.flatMap(List::stream)
+			if (mission.isDisplayable(player))
-			.filter(o -> o.isDisplayable(player))
+			{
-			.collect(Collectors.toList());
+				missionData.add(mission);
-		//@formatter:on
+			}
+		}
+		return missionData;
 	}
 	
 	public Collection<DailyMissionDataHolder> getDailyMissionData(int id)