Removed stream usage from Attackable.

L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -707,10 +707,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -981,7 +990,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -989,6 +1007,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -703,10 +703,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -977,7 +986,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -985,6 +1003,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -703,10 +703,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -977,7 +986,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -985,6 +1003,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -703,10 +703,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -977,7 +986,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -985,6 +1003,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -691,10 +691,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -965,7 +974,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -973,6 +991,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -691,10 +691,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -965,7 +974,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -973,6 +991,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -691,10 +691,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -965,7 +974,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -973,6 +991,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -702,10 +702,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -976,7 +985,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -984,6 +1002,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -702,10 +702,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -976,7 +985,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -984,6 +1002,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -702,10 +702,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -976,7 +985,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -984,6 +1002,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -702,10 +702,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -976,7 +985,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -984,6 +1002,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -708,10 +708,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -982,7 +991,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -990,6 +1008,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -689,10 +689,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -963,7 +972,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -971,6 +989,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -703,10 +703,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -977,7 +986,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -985,6 +1003,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -703,10 +703,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -977,7 +986,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -985,6 +1003,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -703,10 +703,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -977,7 +986,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -985,6 +1003,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -703,10 +703,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -977,7 +986,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -985,6 +1003,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -723,10 +723,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -997,7 +1006,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1005,6 +1023,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -723,10 +723,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -997,7 +1006,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1005,6 +1023,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -723,10 +723,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -997,7 +1006,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1005,6 +1023,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -723,10 +723,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -997,7 +1006,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1005,6 +1023,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -707,10 +707,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -981,7 +990,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -989,6 +1007,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -736,10 +736,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -1010,7 +1019,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1018,6 +1036,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -743,10 +743,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -1017,7 +1026,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1025,6 +1043,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -750,10 +750,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -1024,7 +1033,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1032,6 +1050,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}
 	

L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java

@@ -750,10 +750,19 @@ public class Attackable extends Npc
 	@Override
 	public void addAttackerToAttackByList(Creature creature)
 	{
-		if ((creature == null) || (creature == this) || getAttackByList().stream().anyMatch(o -> o.get() == creature))
+		if ((creature == null) || (creature == this))
 		{
 			return;
 		}
+		
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == creature)
+			{
+				return;
+			}
+		}
+		
 		getAttackByList().add(new WeakReference<>(creature));
 	}
 	
@@ -1024,7 +1033,16 @@ public class Attackable extends Npc
 		result.add(mostHated);
 		
 		final Creature secondMostHatedFinal = secondMostHated;
-		if (getAttackByList().stream().anyMatch(o -> o.get() == secondMostHatedFinal))
+		boolean found = false;
+		for (WeakReference<Creature> ref : getAttackByList())
+		{
+			if (ref.get() == secondMostHatedFinal)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (found)
 		{
 			result.add(secondMostHated);
 		}
@@ -1032,6 +1050,7 @@ public class Attackable extends Npc
 		{
 			result.add(null);
 		}
+		
 		return result;
 	}