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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
trunk/java/com/l2jmobius/gameserver/model/L2World.java
View File

@@ -374,12 +374,7 @@ public final class L2World
*/
public void removeVisibleObject(L2Object object, L2WorldRegion oldWorldRegion)
{
if (object == null)
{
return;
}
if (oldWorldRegion == null)
if ((object == null) || (oldWorldRegion == null))
{
return;
}
@@ -428,13 +423,9 @@ public final class L2World
// Go through visible objects of the selected region
for (L2Object _object : regi.getVisibleObjects().values())
{
if ((_object == null) || _object.equals(object))
if ((_object == null) || _object.equals(object) || !_object.isVisible())
{
continue; // skip our own character
}
else if (!_object.isVisible())
{
continue; // skip dying objects
continue;
}
result.add(_object);
}
@@ -542,22 +533,12 @@ public final class L2World
final List<L2Playable> result = new LinkedList<>();
for (L2WorldRegion regi : reg.getSurroundingRegions())
{
// Create an Iterator to go through the visible L2Object of the L2WorldRegion
final Map<Integer, L2Playable> _allpls = regi.getVisiblePlayable();
final Collection<L2Playable> _playables = _allpls.values();
// Go through visible object of the selected region
for (L2Playable _object : _playables)
for (L2Playable _object : regi.getVisiblePlayable().values())
{
if ((_object == null) || _object.equals(object))
if ((_object == null) || _object.equals(object) || !_object.isVisible())
{
continue; // skip our own character
continue;
}
if (!_object.isVisible())
{
continue; // skip dying objects
}
result.add(_object);
}
}