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

Dropped visibility range variable.

Browse Source
This commit is contained in:
MobiusDev 2018-09-07 16:50:41 +00:00
parent 25c1d5e28c
commit 49e03289d7
8 changed files with 544 additions and 272 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -77,9 +77,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -599,9 +596,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceWorld() != object.getInstanceWorld())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -639,36 +703,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>

102
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -77,9 +77,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -599,9 +596,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceWorld() != object.getInstanceWorld())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -639,36 +703,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>

102
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -77,9 +77,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -599,9 +596,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceWorld() != object.getInstanceWorld())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -639,36 +703,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>

102
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -77,9 +77,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -599,9 +596,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceWorld() != object.getInstanceWorld())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -639,36 +703,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>

102
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -76,9 +76,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -595,9 +592,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceId() != object.getInstanceId())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -635,36 +699,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>

102
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -77,9 +77,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -599,9 +596,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceWorld() != object.getInstanceWorld())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -639,36 +703,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>

102
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -77,9 +77,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -599,9 +596,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceWorld() != object.getInstanceWorld())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -639,36 +703,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>

102
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2World.java
View File

@ -77,9 +77,6 @@ public final class L2World
private static final int REGIONS_X = (MAP_MAX_X >> SHIFT_BY) + OFFSET_X;
private static final int REGIONS_Y = (MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y;
/** Max client visibility distance. **/
private static final int VISIBILITY_RANGE = 3000;
/** Map containing all the players in game. */
private final Map<Integer, L2PcInstance> _allPlayers = new ConcurrentHashMap<>();
/** Map containing all the Good players in game. */
@ -599,9 +596,76 @@ public final class L2World
});
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObject(object, clazz, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObject(L2Object object, Class<T> clazz, Consumer<T> c)
{
forEachVisibleObjectInRange(object, clazz, VISIBILITY_RANGE, c);
if (object == null)
{
return;
}
final L2WorldRegion centerWorldRegion = getRegion(object);
if (centerWorldRegion == null)
{
return;
}
for (L2WorldRegion region : centerWorldRegion.getSurroundingRegions())
{
for (L2Object visibleObject : region.getVisibleObjects().values())
{
if ((visibleObject == null) || (visibleObject == object) || !clazz.isInstance(visibleObject))
{
continue;
}
if (visibleObject.getInstanceWorld() != object.getInstanceWorld())
{
continue;
}
c.accept(clazz.cast(visibleObject));
}
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
public <T extends L2Object> void forEachVisibleObjectInRange(L2Object object, Class<T> clazz, int range, Consumer<T> c)
@ -639,36 +703,6 @@ public final class L2World
}
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, Predicate<T> predicate)
{
return getVisibleObjects(object, clazz, VISIBILITY_RANGE, predicate);
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, result::add);
return result;
}
public <T extends L2Object> List<T> getVisibleObjects(L2Object object, Class<T> clazz, int range, Predicate<T> predicate)
{
final List<T> result = new ArrayList<>();
forEachVisibleObjectInRange(object, clazz, range, o ->
{
if (predicate.test(o))
{
result.add(o);
}
});
return result;
}
/**
* Calculate the current L2WorldRegions of the object according to its position (x,y). <B><U> Example of use </U> :</B>
* <li>Set position of a new L2Object (drop, spawn...)</li>