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

18
trunk/java/com/l2jserver/gameserver/model/entity/L2Event.java
View File

@ -28,6 +28,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Level;
import java.util.logging.Logger;
@ -47,7 +49,8 @@ import com.l2jserver.gameserver.network.serverpackets.NpcHtmlMessage;
import com.l2jserver.gameserver.network.serverpackets.UserInfo;
/**
* @since $Revision: 1.3.4.1 $ $Date: 2005/03/27 15:29:32 $ This ancient thingie got reworked by Nik at $Date: 2011/05/17 21:51:39 $ Yeah, for 6 years no one bothered reworking this buggy event engine.
* @author Nik
* @Since 2011/05/17 21:51:39
*/
public class L2Event
{
@ -57,12 +60,11 @@ public class L2Event
public static String _eventCreator = "";
public static String _eventInfo = "";
public static int _teamsNumber = 0;
public static final Map<Integer, String> _teamNames = new HashMap<>();
public static final List<L2PcInstance> _registeredPlayers = new ArrayList<>();
public static final Map<Integer, List<L2PcInstance>> _teams = new HashMap<>();
public static final Map<Integer, String> _teamNames = new ConcurrentHashMap<>();
public static final List<L2PcInstance> _registeredPlayers = new CopyOnWriteArrayList<>();
public static final Map<Integer, List<L2PcInstance>> _teams = new ConcurrentHashMap<>();
public static int _npcId = 0;
// public static final List<L2Npc> _npcs = new ArrayList<L2Npc>();
private static final Map<L2PcInstance, PlayerEventHolder> _connectionLossData = new HashMap<>();
private static final Map<L2PcInstance, PlayerEventHolder> _connectionLossData = new ConcurrentHashMap<>();
public enum EventState
{
@ -377,7 +379,7 @@ public class L2Event
_eventInfo = br.readLine();
}
List<L2PcInstance> temp = new ArrayList<>();
List<L2PcInstance> temp = new LinkedList<>();
for (L2PcInstance player : L2World.getInstance().getPlayers())
{
if (!player.isOnline())
@ -435,7 +437,7 @@ public class L2Event
// Insert empty lists at _teams.
for (int i = 0; i < _teamsNumber; i++)
{
_teams.put(i + 1, new ArrayList<L2PcInstance>());
_teams.put(i + 1, new CopyOnWriteArrayList<L2PcInstance>());
}
int i = 0;