Fixed Tiat NPE caused by empty players.

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

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);

View File

@ -518,7 +518,7 @@ public class Stage1 extends AbstractInstance implements IXmlReader
{
final List<PlayerInstance> players = new ArrayList<>(world.getPlayers());
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);