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

Fixed Talking Island and Faeron Village scrolls of escape.

Browse Source 
Dropped Batalion Zone due to lack of further development.
Added Various missing syncs from L2jServer Ertheia.
This commit is contained in:
MobiusDev
2015-04-22 16:48:31 +00:00
parent 2bc6b7a553
commit 2cf52bad9b
342 changed files with 5639 additions and 3430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
trunk/java/com/l2jserver/gameserver/instancemanager/DuelManager.java
View File

@ -20,6 +20,7 @@ package com.l2jserver.gameserver.instancemanager;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.model.entity.Duel;
@ -29,20 +30,11 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
public final class DuelManager
{
private final Map<Integer, Duel> _duels = new ConcurrentHashMap<>();
private int _currentDuelId = 0x90;
private final AtomicInteger _currentDuelId = new AtomicInteger();
protected DuelManager()
{
}
private int getNextDuelId()
{
// In case someone wants to run the server forever :)
if (++_currentDuelId >= 2147483640)
{
_currentDuelId = 1;
}
return _currentDuelId;
}
public Duel getDuel(int duelId)
@ -104,7 +96,7 @@ public final class DuelManager
return;
}
}
final int duelId = getNextDuelId();
final int duelId = _currentDuelId.incrementAndGet();
_duels.put(duelId, new Duel(playerA, playerB, partyDuel, duelId));
}