lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed probable CeremonyOfChaos NPE.

Browse Source
This commit is contained in:
MobiusDevelopment 2022-10-23 23:48:39 +00:00
parent 38ee998bbc
commit 6bb89f77de
12 changed files with 180 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_02.5_Underground/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_03.0_Helios/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);

17
L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/instances/CeremonyOfChaos/CeremonyOfChaos.java vendored
View File

@ -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<Player> 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<Player> 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);