WorldObjectKnownList NPE prevention.

This commit is contained in:
MobiusDevelopment
2020-05-16 11:55:52 +00:00
parent 4d3e62f0f8
commit a1417be015
2 changed files with 7 additions and 6 deletions

View File

@@ -18,6 +18,7 @@ package org.l2jmobius.gameserver.model;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
@@ -534,13 +535,13 @@ public class World
{ {
if ((object == null) || !object.isVisible()) if ((object == null) || !object.isVisible())
{ {
return new ArrayList<>(); return Collections.emptyList();
} }
final WorldRegion region = object.getWorldRegion(); final WorldRegion region = object.getWorldRegion();
if (region == null) if (region == null)
{ {
return new ArrayList<>(); return Collections.emptyList();
} }
final int x = object.getX(); final int x = object.getX();
@@ -601,7 +602,7 @@ public class World
{ {
if ((object == null) || !object.isVisible()) if ((object == null) || !object.isVisible())
{ {
return new ArrayList<>(); return Collections.emptyList();
} }
final int x = object.getX(); final int x = object.getX();
@@ -661,7 +662,7 @@ public class World
final WorldRegion region = object.getWorldRegion(); final WorldRegion region = object.getWorldRegion();
if (region == null) if (region == null)
{ {
return null; return Collections.emptyList();
} }
// Create a list in order to contain all visible WorldObject // Create a list in order to contain all visible WorldObject

View File

@@ -110,7 +110,7 @@ public class MultiSort
{ {
if (_keyList == null) if (_keyList == null)
{ {
return new ArrayList<>(); return Collections.emptyList();
} }
return _keyList; return _keyList;
} }
@@ -184,7 +184,7 @@ public class MultiSort
{ {
if (_valueList == null) if (_valueList == null)
{ {
return new ArrayList<>(); return Collections.emptyList();
} }
return _valueList; return _valueList;
} }