Who can help me adapt these lines to frozen or orion please, it's the only thing I'm missing, because several players enter and they all stay in the same area and can see each other
Index: java/net/sf/l2j/gameserver/model/WorldObject.java
===================================================================
--- java/net/sf/l2j/gameserver/model/WorldObject.java (revision 17)
+++ java/net/sf/l2j/gameserver/model/WorldObject.java (working copy)
@@ -15,6 +15,9 @@
import net.sf.l2j.gameserver.model.actor.Creature;
import net.sf.l2j.gameserver.model.actor.Playable;
import net.sf.l2j.gameserver.model.actor.Player;
+import net.sf.l2j.gameserver.model.actor.instance.Fence;
+import net.sf.l2j.gameserver.model.entity.events.instance.Instance;
+import net.sf.l2j.gameserver.model.entity.events.instance.InstanceManager;
import net.sf.l2j.gameserver.model.location.Location;
import net.sf.l2j.gameserver.model.location.SpawnLocation;
import net.sf.l2j.gameserver.model.zone.type.subtype.ZoneType;
@@ -393,6 +396,11 @@
}
}
+ for (WorldObject object : getDifferentInstanceObjects())
+ {
+ object.removeKnownObject(this);
+ removeKnownObject(object);
+ }
// For every new surrounding area NOT SHARED with old surrounding areas.
for (WorldRegion region : newAreas)
{
@@ -405,9 +413,8 @@
// Update all objects.
for (WorldObject obj : region.getObjects())
{
- if (obj == this)
+ if (obj == this || obj.getInstance().getId() != getInstance().getId())
continue;
-
obj.addKnownObject(this);
addKnownObject(obj);
}
@@ -487,6 +494,8 @@
{
if (obj == this || !type.isAssignableFrom(obj.getClass()))
continue;
+ if (obj.getInstance().getId() != getInstance().getId() && !(obj instanceof Fence))
+ continue;
result.add((A) obj);
}
@@ -517,6 +526,8 @@
{
if (obj == this || !type.isAssignableFrom(obj.getClass()) || !predicate.test((A) obj))
continue;
+ if (obj.getInstance().getId() != getInstance().getId() && !(obj instanceof Fence))
+ continue;
result.add((A) obj);
}
@@ -547,6 +558,8 @@
{
if (obj == this || !type.isAssignableFrom(obj.getClass()) || !MathUtil.checkIfInRange(radius, this, obj, true))
continue;
+ if (obj.getInstance().getId() != getInstance().getId() && !(obj instanceof Fence))
+ continue;
result.add((A) obj);
}
@@ -807,6 +820,46 @@
}
+ private Instance _instance = InstanceManager.getInstance().getInstance(0);
+
+ public void setInstance(Instance instance, boolean silent)
+ {
+ _instance = instance;
+
+ if (!silent)
+ {
+ decayMe();
+ spawnMe();
+ }
+ }
+
+ public Instance getInstance()
+ {
+ return _instance;
+ }
+
+ private final List<WorldObject> getDifferentInstanceObjects()
+ {
+ final WorldRegion region = _region;
+ if (region == null)
+ return Collections.emptyList();
+
+ final List<WorldObject> result = new ArrayList<>();
+
+ for (WorldRegion reg : region.getSurroundingRegions())
+ {
+ for (WorldObject obj : reg.getObjects())
+ {
+ if (obj == this || obj.getInstance().getId() == getInstance().getId() || obj instanceof Fence)
+ continue;
+
+ result.add(obj);
+ }
+ }
+
+ return result;
+ }
+
public void onActionShift(Player player)
{
player.sendPacket(ActionFailed.STATIC_PACKET);
