diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; } diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java index 559a7e4072..604454a214 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/stats/finalizers/RegenHPFinalizer.java @@ -26,6 +26,7 @@ import org.l2jmobius.gameserver.instancemanager.SiegeManager; import org.l2jmobius.gameserver.instancemanager.ZoneManager; import org.l2jmobius.gameserver.model.SiegeClan; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Player; import org.l2jmobius.gameserver.model.actor.instance.Pet; import org.l2jmobius.gameserver.model.residences.AbstractResidence; @@ -176,7 +177,21 @@ public class RegenHPFinalizer implements IStatFunction } final SiegeClan siegeClan = siege.getAttackerClan(player.getClan().getId()); - if ((siegeClan == null) || siegeClan.getFlag().isEmpty() || !Util.checkIfInRange(200, player, siegeClan.getFlag().stream().findAny().get(), true)) + if ((siegeClan == null) || siegeClan.getFlag().isEmpty()) + { + return 0; + } + + boolean inRange = false; + for (Npc flag : siegeClan.getFlag()) + { + if (Util.checkIfInRange(200, player, flag, true)) + { + inRange = true; + break; + } + } + if (!inRange) { return 0; }