All pastes #32893 Raw Edit

Someone

public text v1 · immutable
#32893 ·published 2005-12-07 23:51 UTC
rendered paste body
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<L2Character> allObjects = new FastList<L2Character>(); 
         
-        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<L2Object> allObjects = new FastList<L2Object>(); 
         
-        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;
     }