Index: C:/Development/l2j/eclipse/workspace/L2_GameserverSVN/java/net/sf/l2j/gameserver/util/KnownList.java =================================================================== --- C:/Development/l2j/eclipse/workspace/L2_GameserverSVN/java/net/sf/l2j/gameserver/util/KnownList.java (revision 1863) +++ C:/Development/l2j/eclipse/workspace/L2_GameserverSVN/java/net/sf/l2j/gameserver/util/KnownList.java (working copy) @@ -201,10 +201,29 @@ { FastList allObjects = new FastList(); - if (getKnownPlayers().size() > 0) allObjects.addAll(getKnownPlayers()); - if (getKnownMonsters().size() > 0) allObjects.addAll(getKnownMonsters()); - if (getKnownNpcs().size() > 0) allObjects.addAll(getKnownNpcs()); - if (getKnownCharacters().size() > 0) allObjects.addAll(getKnownCharacters()); + if (getKnownPlayers().size() > 0) + { + for (L2PcInstance obj: getKnownPlayers()) + if (obj != null) allObjects.add(obj); + } + + if (getKnownMonsters().size() > 0) + { + for (L2MonsterInstance obj: getKnownMonsters()) + if (obj != null) allObjects.add(obj); + } + + if (getKnownNpcs().size() > 0) + { + for (L2NpcInstance obj: getKnownNpcs()) + if (obj != null) allObjects.add(obj); + } + + if (getKnownCharacters().size() > 0) + { + for (L2Character obj: getKnownCharacters()) + if (obj != null) allObjects.add(obj); + } return allObjects; } @@ -228,12 +247,37 @@ { FastList allObjects = new FastList(); - if (getKnownPlayers().size() > 0) allObjects.addAll(getKnownPlayers()); - if (getKnownMonsters().size() > 0) allObjects.addAll(getKnownMonsters()); - if (getKnownNpcs().size() > 0) allObjects.addAll(getKnownNpcs()); - if (getOtherKnownObjects().size() > 0) allObjects.addAll(getOtherKnownObjects()); - if (getKnownCharacters().size() > 0) allObjects.addAll(getKnownCharacters()); + if (getKnownPlayers().size() > 0) + { + for (L2PcInstance obj: getKnownPlayers()) + if (obj != null) allObjects.add(obj); + } + + if (getKnownMonsters().size() > 0) + { + for (L2MonsterInstance obj: getKnownMonsters()) + if (obj != null) allObjects.add(obj); + } + + if (getKnownNpcs().size() > 0) + { + for (L2NpcInstance obj: getKnownNpcs()) + if (obj != null) allObjects.add(obj); + } + + if (getOtherKnownObjects().size() > 0) + { + for (L2Object obj: getOtherKnownObjects()) + if (obj != null) allObjects.add(obj); + } + + if (getKnownCharacters().size() > 0) + { + for (L2Character obj: getKnownCharacters()) + if (obj != null) allObjects.add(obj); + } + return allObjects; }