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

Fixed Tiat NPE caused by empty players.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-02-28 03:37:54 +00:00
parent 3f31ef2c63
commit daf60e29cc
9 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);

2
L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/ai/bosses/Tiat/Stage1.java vendored
View File

@@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{ {
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers()); final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
final int deviceCount = world.getParameters().getInt("deviceCount", 0); final int deviceCount = world.getParameters().getInt("deviceCount", 0);
if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !getRandomEntry(players).isDead()) if ((deviceCount < MAX_DEVICESPAWNEDMOBCOUNT) && !players.isEmpty() && !getRandomEntry(players).isDead())
{ {
world.setParameter("deviceCount", deviceCount + 1); world.setParameter("deviceCount", deviceCount + 1);