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

Avoid probable concurrency issues.

Browse Source
This commit is contained in:
MobiusDevelopment
2019-04-05 04:53:07 +00:00
parent eed915b9dc
commit 67cc5e1e45
24 changed files with 59 additions and 47 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

@@ -363,7 +363,7 @@ public final class InstanceManager implements IXmlReader
* @param templateId the instance template id
* @return
*/
public Instance createDynamicInstance(int templateId)
public synchronized Instance createDynamicInstance(int templateId)
{
while (getInstance(_dynamic) != null)
{

5
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/instancemanager/ZoneManager.java
View File

@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.Optional;
import java.util.OptionalInt;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -69,7 +70,7 @@ public final class ZoneManager implements IXmlReader
private final Map<Class<? extends ZoneType>, ConcurrentHashMap<Integer, ? extends ZoneType>> _classZones = new ConcurrentHashMap<>();
private final Map<String, NpcSpawnTerritory> _spawnTerritories = new ConcurrentHashMap<>();
private volatile int _lastDynamicId = 300000;
private final AtomicInteger _lastDynamicId = new AtomicInteger(300000);
private List<ItemInstance> _debugItems;
private final ZoneRegion[][] _zoneRegions = new ZoneRegion[(World.MAP_MAX_X >> SHIFT_BY) + OFFSET_X + 1][(World.MAP_MAX_Y >> SHIFT_BY) + OFFSET_Y + 1];
@@ -187,7 +188,7 @@ public final class ZoneManager implements IXmlReader
}
else
{
zoneId = zoneType.equalsIgnoreCase("NpcSpawnTerritory") ? 0 : _lastDynamicId++;
zoneId = zoneType.equalsIgnoreCase("NpcSpawnTerritory") ? 0 : _lastDynamicId.incrementAndGet();
}
attribute = attrs.getNamedItem("name");