From 6e8a72c251e7ec29920aed0a9f632eee98a45fac Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 8 Jan 2023 14:34:48 +0000 Subject: [PATCH] Removed stream usage from Attackable. --- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- .../gameserver/model/actor/Attackable.java | 23 +++++++++++++++++-- 26 files changed, 546 insertions(+), 52 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a4f0cf03b6..b46680d4f0 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 00a955e76f..44b0babd6f 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 00a955e76f..44b0babd6f 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 00a955e76f..44b0babd6f 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 706697b47a..9b3caee9d1 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 706697b47a..9b3caee9d1 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 706697b47a..9b3caee9d1 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 06a399d134..d1b123ea77 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 06a399d134..d1b123ea77 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 06a399d134..d1b123ea77 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4e401749ae..8f552d5a00 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index f59d20409b..579ddfc8a9 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java index c6f94b1d77..0b87181363 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java index bdec9ebe13..2d1a1fd5ef 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index bdec9ebe13..2d1a1fd5ef 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index bdec9ebe13..2d1a1fd5ef 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a5837eeb7a..4ec468eca0 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 94606bc581..26700362d1 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 94606bc581..26700362d1 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 94606bc581..26700362d1 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 94606bc581..26700362d1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 14f8a660cd..d10a90dd59 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java index cbd9aa72a9..1bd74841cf 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 501eae8d0e..6036b88424 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 3480884ddd..5bf7401eb9 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 3480884ddd..5bf7401eb9 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/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 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 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; }