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

Save allowed player instances instead of object ids.

Browse Source
This commit is contained in:
MobiusDev
2018-06-08 16:27:20 +00:00
parent 913dbff9a6
commit 3cd9404a34
71 changed files with 422 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/InstanceManager.java
View File

@@ -270,7 +270,7 @@ public final class InstanceManager implements IGameXmlReader
{
for (InstanceWorld temp : _instanceWorlds.values())
{
if ((temp != null) && (temp.isAllowed(player.getObjectId())))
if ((temp != null) && (temp.isAllowed(player)))
{
return temp;
}

6
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/events/AbstractScript.java
View File

@@ -44,7 +44,6 @@ import com.l2jmobius.gameserver.instancemanager.CastleManager;
import com.l2jmobius.gameserver.instancemanager.FortManager;
import com.l2jmobius.gameserver.instancemanager.ZoneManager;
import com.l2jmobius.gameserver.model.L2Spawn;
import com.l2jmobius.gameserver.model.L2World;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.actor.L2Attackable;
import com.l2jmobius.gameserver.model.actor.L2Character;
@@ -2928,12 +2927,11 @@ public abstract class AbstractScript extends ManagedScript
{
if (world != null)
{
for (int objId : world.getAllowed())
for (L2PcInstance player : world.getAllowed())
{
final L2PcInstance player = L2World.getInstance().getPlayer(objId);
if ((player != null) && (player.getInstanceId() == world.getInstanceId()))
{
playMovie(L2World.getInstance().getPlayer(objId), movie);
playMovie(player, movie);
}
}
}

25
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/instancezone/InstanceWorld.java
View File

@@ -17,7 +17,8 @@
package com.l2jmobius.gameserver.model.instancezone;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
import com.l2jmobius.commons.util.CommonUtil;
@@ -25,6 +26,7 @@ import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
/**
* Basic instance zone data transfer object.
@@ -33,7 +35,7 @@ import com.l2jmobius.gameserver.model.actor.instance.L2DoorInstance;
public class InstanceWorld
{
private Instance _instance;
private final List<Integer> _allowed = new CopyOnWriteArrayList<>();
private final Set<L2PcInstance> _players = ConcurrentHashMap.newKeySet();
private final StatsSet _parameters = new StatsSet();
/**
@@ -63,24 +65,27 @@ public class InstanceWorld
return _instance.getTemplateId();
}
public List<Integer> getAllowed()
public Set<L2PcInstance> getAllowed()
{
return _allowed;
return _players;
}
public void removeAllowed(int id)
public void removeAllowed(L2PcInstance player)
{
_allowed.remove(_allowed.indexOf(Integer.valueOf(id)));
_players.remove(player);
}
public void addAllowed(int id)
public void addAllowed(L2PcInstance player)
{
_allowed.add(id);
if (!_players.contains(player))
{
_players.add(player);
}
}
public boolean isAllowed(int id)
public boolean isAllowed(L2PcInstance player)
{
return _allowed.contains(id);
return _players.contains(player);
}
/**