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

Sync with L2jServer HighFive Mar 25th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-03-25 06:48:51 +00:00
parent e0c66b1412
commit 82606870c0
194 changed files with 2619 additions and 2869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
trunk/java/com/l2jserver/gameserver/model/L2World.java
View File

@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@ -446,15 +447,12 @@ public final class L2World
return null;
}
// Create an ArrayList in order to contain all visible L2Object
List<L2Object> result = new ArrayList<>();
// Go through the ArrayList of region
// Create a list in order to contain all visible objects.
final List<L2Object> result = new LinkedList<>();
for (L2WorldRegion regi : reg.getSurroundingRegions())
{
// Go through visible objects of the selected region
Collection<L2Object> vObj = regi.getVisibleObjects().values();
for (L2Object _object : vObj)
for (L2Object _object : regi.getVisibleObjects().values())
{
if ((_object == null) || _object.equals(object))
{
@ -488,15 +486,12 @@ public final class L2World
final int sqRadius = radius * radius;
// Create an ArrayList in order to contain all visible L2Object
List<L2Object> result = new ArrayList<>();
// Go through the ArrayList of region
// Create a list in order to contain all visible objects.
final List<L2Object> result = new LinkedList<>();
for (L2WorldRegion regi : object.getWorldRegion().getSurroundingRegions())
{
// Go through visible objects of the selected region
Collection<L2Object> vObj = regi.getVisibleObjects().values();
for (L2Object _object : vObj)
for (L2Object _object : regi.getVisibleObjects().values())
{
if ((_object == null) || _object.equals(object))
{
@ -529,14 +524,11 @@ public final class L2World
final int sqRadius = radius * radius;
// Create an ArrayList in order to contain all visible L2Object
List<L2Object> result = new ArrayList<>();
// Go through visible object of the selected region
// Create a list in order to contain all visible objects.
final List<L2Object> result = new LinkedList<>();
for (L2WorldRegion regi : object.getWorldRegion().getSurroundingRegions())
{
Collection<L2Object> vObj = regi.getVisibleObjects().values();
for (L2Object _object : vObj)
for (L2Object _object : regi.getVisibleObjects().values())
{
if ((_object == null) || _object.equals(object))
{
@ -567,10 +559,8 @@ public final class L2World
return null;
}
// Create an ArrayList in order to contain all visible L2Object
List<L2Playable> result = new ArrayList<>();
// Go through the ArrayList of region
// Create a list in order to contain all visible objects.
final List<L2Playable> result = new LinkedList<>();
for (L2WorldRegion regi : reg.getSurroundingRegions())
{
// Create an Iterator to go through the visible L2Object of the L2WorldRegion