diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 8032b289ef..93de2774a9 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 8f47b1c64d..df702cdce2 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 8f47b1c64d..df702cdce2 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 8f47b1c64d..df702cdce2 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index d4584dd501..a405fd2aae 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index af6a1e1b22..bfeaae6549 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index af6a1e1b22..bfeaae6549 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index d449b6aaf3..5a757d9f99 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index d449b6aaf3..5a757d9f99 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index d449b6aaf3..5a757d9f99 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 6406df1af5..45de49d514 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java index 6406df1af5..45de49d514 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java @@ -22,6 +22,7 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; import java.util.List; +import java.util.Optional; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; @@ -599,7 +600,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000); @@ -814,7 +821,13 @@ public class CeremonyOfChaos extends AbstractNpcAI { while (time == -1) { - final Player random = PARTICIPANT_PLAYERS.stream().findAny().get(); + final Optional optional = PARTICIPANT_PLAYERS.stream().findAny(); + if (!optional.isPresent()) + { + return; + } + + final Player random = optional.get(); if ((random != null) && random.isInInstance()) { time = (int) (random.getInstanceWorld().getRemainingTime() / 1000);