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

Sync with L2jServer HighFive Mar 25th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-03-25 06:48:51 +00:00
parent e0c66b1412
commit 82606870c0
194 changed files with 2619 additions and 2869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
trunk/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java
View File

@ -47,7 +47,7 @@ public abstract class L2ZoneType extends ListenersContainer
private final int _id;
protected L2ZoneForm _zone;
protected ConcurrentHashMap<Integer, L2Character> _characterList;
protected Map<Integer, L2Character> _characterList;
/** Parameters to affect specific characters */
private boolean _checkAffected = false;

10
trunk/java/com/l2jserver/gameserver/model/zone/type/L2BossZone.java
View File

@ -18,10 +18,10 @@
*/
package com.l2jserver.gameserver.model.zone.type;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import com.l2jserver.gameserver.GameServer;
import com.l2jserver.gameserver.instancemanager.GrandBossManager;
@ -56,13 +56,13 @@ public class L2BossZone extends L2ZoneType
// track the times that players got disconnected. Players are allowed
// to log back into the zone as long as their log-out was within _timeInvade time...
// <player objectId, expiration time in milliseconds>
private final Map<Integer, Long> _playerAllowedReEntryTimes = new HashMap<>();
private final Map<Integer, Long> _playerAllowedReEntryTimes = new ConcurrentHashMap<>();
// track the players admitted to the zone who should be allowed back in
// after reboot/server downtime (outside of their control), within 30 of server restart
private final List<Integer> _playersAllowed = new ArrayList<>();
private final List<Integer> _playersAllowed = new CopyOnWriteArrayList<>();
private final List<L2Character> _raidList = new ArrayList<>();
private final List<L2Character> _raidList = new CopyOnWriteArrayList<>();
protected Settings()
{

3
trunk/java/com/l2jserver/gameserver/model/zone/type/L2EffectZone.java
View File

@ -18,6 +18,7 @@
*/
package com.l2jserver.gameserver.model.zone.type;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
@ -46,7 +47,7 @@ public class L2EffectZone extends L2ZoneType
private int _reuse;
protected boolean _bypassConditions;
private boolean _isShowDangerIcon;
protected volatile ConcurrentHashMap<Integer, Integer> _skills;
protected volatile Map<Integer, Integer> _skills;
public L2EffectZone(int id)
{