BETA: Core cleanup:

	* Enabling "Redundant argument type" warning.
	* Respective fixes.

L2J_Server_BETA/.settings/org.eclipse.jdt.core.prefs

@@ -61,7 +61,7 @@ org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warnin
 org.eclipse.jdt.core.compiler.problem.potentialNullReference=warning
 org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
 org.eclipse.jdt.core.compiler.problem.redundantNullCheck=warning
-org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=warning
 org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=warning
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
 org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore

L2J_Server_BETA/java/com/l2jserver/Config.java

@@ -749,13 +749,13 @@ public final class Config
 	public static String ANNOUNCE_PVP_MSG;
 	public static boolean L2JMOD_CHAT_ADMIN;
 	public static boolean L2JMOD_MULTILANG_ENABLE;
-	public static List<String> L2JMOD_MULTILANG_ALLOWED = new ArrayList<String>();
+	public static List<String> L2JMOD_MULTILANG_ALLOWED = new ArrayList<>();
 	public static String L2JMOD_MULTILANG_DEFAULT;
 	public static boolean L2JMOD_MULTILANG_VOICED_ALLOW;
 	public static boolean L2JMOD_MULTILANG_SM_ENABLE;
-	public static List<String> L2JMOD_MULTILANG_SM_ALLOWED = new ArrayList<String>();
+	public static List<String> L2JMOD_MULTILANG_SM_ALLOWED = new ArrayList<>();
 	public static boolean L2JMOD_MULTILANG_NS_ENABLE;
-	public static List<String> L2JMOD_MULTILANG_NS_ALLOWED = new ArrayList<String>();
+	public static List<String> L2JMOD_MULTILANG_NS_ALLOWED = new ArrayList<>();
 	public static boolean L2WALKER_PROTECTION;
 	public static boolean L2JMOD_DEBUG_VOICE_COMMAND;
 	public static int L2JMOD_DUALBOX_CHECK_MAX_PLAYERS_PER_IP;
@@ -1722,7 +1722,7 @@ public final class Config
 				TELEPORT_WATCHDOG_TIMEOUT = Integer.parseInt(Character.getProperty("TeleportWatchdogTimeout", "0"));
 				PLAYER_SPAWN_PROTECTION = Integer.parseInt(Character.getProperty("PlayerSpawnProtection", "0"));
 				String[] items = Character.getProperty("PlayerSpawnProtectionAllowedItems", "0").split(",");
-				SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<Integer>(items.length);
+				SPAWN_PROTECTION_ALLOWED_ITEMS = new ArrayList<>(items.length);
 				for (String item : items)
 				{
 					Integer itm = 0;
@@ -3007,7 +3007,7 @@ public final class Config
 				BufferedReader br = new BufferedReader(fr);
 				LineNumberReader lnr = new LineNumberReader(br))
 			{
-				FILTER_LIST = new ArrayList<String>();
+				FILTER_LIST = new ArrayList<>();
 				
 				String line = null;
 				while ((line = lnr.readLine()) != null)

L2J_Server_BETA/java/com/l2jserver/gameserver/Announcements.java

@@ -48,9 +48,9 @@ public class Announcements
 {
 	private static Logger _log = Logger.getLogger(Announcements.class.getName());
 	
-	private List<String> _announcements = new FastList<String>();
-	private List<String> _critAnnouncements = new FastList<String>();
-	private List<List<Object>> _eventAnnouncements = new FastList<List<Object>>();
+	private List<String> _announcements = new FastList<>();
+	private List<String> _critAnnouncements = new FastList<>();
+	private List<List<Object>> _eventAnnouncements = new FastList<>();
 	
 	protected Announcements()
 	{
@@ -110,7 +110,7 @@ public class Announcements
 	
 	public void addEventAnnouncement(DateRange validDateRange, String[] msg)
 	{
-		List<Object> entry = new FastList<Object>();
+		List<Object> entry = new FastList<>();
 		entry.add(validDateRange);
 		entry.add(msg);
 		_eventAnnouncements.add(entry);

L2J_Server_BETA/java/com/l2jserver/gameserver/GameServer.java

@@ -400,7 +400,7 @@ public class GameServer
 		sc.TCP_NODELAY = Config.MMO_TCP_NODELAY;
 		
 		_gamePacketHandler = new L2GamePacketHandler();
-		_selectorThread = new SelectorThread<L2GameClient>(sc, _gamePacketHandler, _gamePacketHandler, _gamePacketHandler, new IPv4Filter());
+		_selectorThread = new SelectorThread<>(sc, _gamePacketHandler, _gamePacketHandler, _gamePacketHandler, new IPv4Filter());
 		
 		InetAddress bindAddress = null;
 		if (!Config.GAMESERVER_HOSTNAME.equals("*"))

L2J_Server_BETA/java/com/l2jserver/gameserver/GameTimeController.java

@@ -43,7 +43,7 @@ public class GameTimeController
 	protected static boolean _isNight = false;
 	protected static boolean _interruptRequest = false;
 	
-	protected static final TIntObjectHashMap<L2Character> _movingObjects = new TIntObjectHashMap<L2Character>();
+	protected static final TIntObjectHashMap<L2Character> _movingObjects = new TIntObjectHashMap<>();
 	private static final ReentrantLock _lock = new ReentrantLock();
 	
 	protected static TimerThread _timer;

L2J_Server_BETA/java/com/l2jserver/gameserver/GeoEngine.java

@@ -55,8 +55,8 @@ public class GeoEngine extends GeoData
 	private static final byte SOUTH = 4;
 	private static final byte NORTH = 8;
 	private static final byte NSWE_ALL = 15;
-	private static TShortObjectHashMap<MappedByteBuffer> _geodata = new TShortObjectHashMap<MappedByteBuffer>();
-	private static TShortObjectHashMap<IntBuffer> _geodataIndex = new TShortObjectHashMap<IntBuffer>();
+	private static TShortObjectHashMap<MappedByteBuffer> _geodata = new TShortObjectHashMap<>();
+	private static TShortObjectHashMap<IntBuffer> _geodataIndex = new TShortObjectHashMap<>();
 	private static BufferedOutputStream _geoBugsOut;
 	
 	public static GeoEngine getInstance()

L2J_Server_BETA/java/com/l2jserver/gameserver/ItemsAutoDestroy.java

@@ -34,7 +34,7 @@ public class ItemsAutoDestroy
 	
 	protected ItemsAutoDestroy()
 	{
-		_items = new FastList<L2ItemInstance>();
+		_items = new FastList<>();
 		_sleep = Config.AUTODESTROY_ITEM_AFTER * 1000;
 		if (_sleep == 0) // it should not happend as it is not called when AUTODESTROY_ITEM_AFTER = 0 but we never know..
 			_sleep = 3600000;

L2J_Server_BETA/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -134,7 +134,7 @@ public class LoginServerThread extends Thread
 		_reserveHost = Config.RESERVE_HOST_ON_LOGIN;
 		_subnets = Config.GAME_SERVER_SUBNETS;
 		_hosts = Config.GAME_SERVER_HOSTS;
-		_waitingClients = new FastList<WaitingClient>();
+		_waitingClients = new FastList<>();
 		_accountsInGameServer.shared();
 		_maxPlayer = Config.MAXIMUM_ONLINE_USERS;
 	}
@@ -293,7 +293,7 @@ public class LoginServerThread extends Thread
 							sendPacket(st);
 							if (L2World.getInstance().getAllPlayersCount() > 0)
 							{
-								FastList<String> playerList = new FastList<String>();
+								FastList<String> playerList = new FastList<>();
 								for (L2PcInstance player : L2World.getInstance().getAllPlayersArray())
 								{
 									playerList.add(player.getAccountName());
@@ -536,7 +536,7 @@ public class LoginServerThread extends Thread
 	{
 		Connection con = null;
 		int chars = 0;
-		List<Long> charToDel = new ArrayList<Long>();
+		List<Long> charToDel = new ArrayList<>();
 		try
 		{
 			con = L2DatabaseFactory.getInstance().getConnection();

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSigns.java

@@ -164,10 +164,10 @@ public class SevenSigns
 	
 	protected SevenSigns()
 	{
-		_signsPlayerData = new FastMap<Integer, StatsSet>();
-		_signsSealOwners = new FastMap<Integer, Integer>();
-		_signsDuskSealTotals = new FastMap<Integer, Integer>();
-		_signsDawnSealTotals = new FastMap<Integer, Integer>();
+		_signsPlayerData = new FastMap<>();
+		_signsSealOwners = new FastMap<>();
+		_signsDuskSealTotals = new FastMap<>();
+		_signsDawnSealTotals = new FastMap<>();
 		
 		try
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/SevenSignsFestival.java

@@ -782,17 +782,17 @@ public class SevenSignsFestival implements SpawnListener
 	
 	protected SevenSignsFestival()
 	{
-		_accumulatedBonuses = new FastList<Integer>();
+		_accumulatedBonuses = new FastList<>();
 		
-		_dawnFestivalParticipants = new FastMap<Integer, List<Integer>>();
-		_dawnPreviousParticipants = new FastMap<Integer, List<Integer>>();
-		_dawnFestivalScores = new FastMap<Integer, Long>();
+		_dawnFestivalParticipants = new FastMap<>();
+		_dawnPreviousParticipants = new FastMap<>();
+		_dawnFestivalScores = new FastMap<>();
 		
-		_duskFestivalParticipants = new FastMap<Integer, List<Integer>>();
-		_duskPreviousParticipants = new FastMap<Integer, List<Integer>>();
-		_duskFestivalScores = new FastMap<Integer, Long>();
+		_duskFestivalParticipants = new FastMap<>();
+		_duskPreviousParticipants = new FastMap<>();
+		_duskFestivalScores = new FastMap<>();
 		
-		_festivalData = new FastMap<Integer, Map<Integer, StatsSet>>();
+		_festivalData = new FastMap<>();
 		
 		restoreFestivalData();
 		
@@ -969,7 +969,7 @@ public class SevenSignsFestival implements SpawnListener
 				Map<Integer, StatsSet> tempData = _festivalData.get(festivalCycle);
 				
 				if (tempData == null)
-					tempData = new FastMap<Integer, StatsSet>();
+					tempData = new FastMap<>();
 				
 				tempData.put(festivalId, festivalDat);
 				_festivalData.put(festivalCycle, tempData);
@@ -1219,7 +1219,7 @@ public class SevenSignsFestival implements SpawnListener
 		_duskFestivalScores.clear();
 		
 		// Set up a new data set for the current cycle of festivals
-		Map<Integer, StatsSet> newData = new FastMap<Integer, StatsSet>();
+		Map<Integer, StatsSet> newData = new FastMap<>();
 		
 		for (int i = 0; i < FESTIVAL_COUNT * 2; i++)
 		{
@@ -1388,7 +1388,7 @@ public class SevenSignsFestival implements SpawnListener
 		
 		if (festivalParty != null)
 		{
-			participants = new ArrayList<Integer>(festivalParty.getMemberCount());
+			participants = new ArrayList<>(festivalParty.getMemberCount());
 			for (L2PcInstance player : festivalParty.getMembers())
 			{
 				if (player == null)
@@ -1575,7 +1575,7 @@ public class SevenSignsFestival implements SpawnListener
 				return false;
 			
 			List<Integer> prevParticipants = getPreviousParticipants(oracle, festivalId);
-			partyMembers = new ArrayList<String>(prevParticipants.size());
+			partyMembers = new ArrayList<>(prevParticipants.size());
 			
 			// Record a string list of the party members involved.
 			for (Integer partyMember : prevParticipants)
@@ -1770,7 +1770,7 @@ public class SevenSignsFestival implements SpawnListener
 		
 		public FestivalManager()
 		{
-			_festivalInstances = new FastMap<Integer, L2DarknessFestival>();
+			_festivalInstances = new FastMap<>();
 			_managerInstance = this;
 			
 			// Increment the cycle counter.
@@ -2059,8 +2059,8 @@ public class SevenSignsFestival implements SpawnListener
 		{
 			_cabal = cabal;
 			_levelRange = levelRange;
-			_originalLocations = new FastMap<Integer, FestivalSpawn>();
-			_npcInsts = new FastList<L2FestivalMonsterInstance>();
+			_originalLocations = new FastMap<>();
+			_npcInsts = new FastList<>();
 			
 			if (cabal == SevenSigns.CABAL_DAWN)
 			{
@@ -2077,7 +2077,7 @@ public class SevenSignsFestival implements SpawnListener
 			
 			// FOR TESTING!
 			if (_participants == null)
-				_participants = new ArrayList<Integer>();
+				_participants = new ArrayList<>();
 			
 			festivalInit();
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/TradeController.java

@@ -42,7 +42,7 @@ public class TradeController
 	private static Logger _log = Logger.getLogger(TradeController.class.getName());
 	
 	private int _nextListId;
-	private Map<Integer, L2TradeList> _lists = new FastMap<Integer, L2TradeList>();
+	private Map<Integer, L2TradeList> _lists = new FastMap<>();
 	
 	//**
 	// * Task launching the function for restore count of Item (Clan Hall) 
@@ -282,7 +282,7 @@ public class TradeController
 	
 	public List<L2TradeList> getBuyListByNpcId(int npcId)
 	{
-		List<L2TradeList> lists = new FastList<L2TradeList>();
+		List<L2TradeList> lists = new FastList<>();
 		Collection<L2TradeList> values = _lists.values();
 		
 		for (L2TradeList list : values)

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -1133,19 +1133,19 @@ public class L2CharacterAI extends AbstractAI
 		public boolean isHealer = false;
 		public boolean isFighter = false;
 		public boolean cannotMoveOnLand = false;
-		public List<L2Skill> generalSkills = new FastList<L2Skill>();
-		public List<L2Skill> buffSkills = new FastList<L2Skill>();
+		public List<L2Skill> generalSkills = new FastList<>();
+		public List<L2Skill> buffSkills = new FastList<>();
 		public int lastBuffTick = 0;
-		public List<L2Skill> debuffSkills = new FastList<L2Skill>();
+		public List<L2Skill> debuffSkills = new FastList<>();
 		public int lastDebuffTick = 0;
-		public List<L2Skill> cancelSkills = new FastList<L2Skill>();
-		public List<L2Skill> healSkills = new FastList<L2Skill>();
-		//public List<L2Skill> trickSkills = new FastList<L2Skill>();
-		public List<L2Skill> generalDisablers = new FastList<L2Skill>();
-		public List<L2Skill> sleepSkills = new FastList<L2Skill>();
-		public List<L2Skill> rootSkills = new FastList<L2Skill>();
-		public List<L2Skill> muteSkills = new FastList<L2Skill>();
-		public List<L2Skill> resurrectSkills = new FastList<L2Skill>();
+		public List<L2Skill> cancelSkills = new FastList<>();
+		public List<L2Skill> healSkills = new FastList<>();
+		//public List<L2Skill> trickSkills = new FastList<>();
+		public List<L2Skill> generalDisablers = new FastList<>();
+		public List<L2Skill> sleepSkills = new FastList<>();
+		public List<L2Skill> rootSkills = new FastList<>();
+		public List<L2Skill> muteSkills = new FastList<>();
+		public List<L2Skill> resurrectSkills = new FastList<>();
 		public boolean hasHealOrResurrect = false;
 		public boolean hasLongRangeSkills = false;
 		public boolean hasLongRangeDamageSkills = false;

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2ControllableMobAI.java

@@ -443,7 +443,7 @@ public class L2ControllableMobAI extends L2AttackableAI
 		double dy, dx;
 		double dblAggroRange = aggroRange * aggroRange;
 		
-		List<L2Character> potentialTarget = new FastList<L2Character>();
+		List<L2Character> potentialTarget = new FastList<>();
 		
 		Collection<L2Object> objs = npc.getKnownList().getKnownObjects().values();
 		for (L2Object obj : objs)

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2SpecialSiegeGuardAI.java

@@ -33,7 +33,7 @@ public final class L2SpecialSiegeGuardAI extends L2SiegeGuardAI
 	public L2SpecialSiegeGuardAI(AIAccessor accessor)
 	{
 		super(accessor);
-		_allied = new ArrayList<Integer>();
+		_allied = new ArrayList<>();
 	}
 	
 	public ArrayList<Integer> getAlly()

L2J_Server_BETA/java/com/l2jserver/gameserver/cache/CrestCache.java

@@ -42,11 +42,11 @@ public class CrestCache
 {
 	private static Logger _log = Logger.getLogger(CrestCache.class.getName());
 	
-	private final FastMRUCache<Integer, byte[]> _cachePledge = new FastMRUCache<Integer, byte[]>();
+	private final FastMRUCache<Integer, byte[]> _cachePledge = new FastMRUCache<>();
 	
-	private final FastMRUCache<Integer, byte[]> _cachePledgeLarge = new FastMRUCache<Integer, byte[]>();
+	private final FastMRUCache<Integer, byte[]> _cachePledgeLarge = new FastMRUCache<>();
 	
-	private final FastMRUCache<Integer, byte[]> _cacheAlly = new FastMRUCache<Integer, byte[]>();
+	private final FastMRUCache<Integer, byte[]> _cacheAlly = new FastMRUCache<>();
 	
 	private int _loadedFiles;
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/cache/FastMRUCache.java

@@ -38,7 +38,7 @@ public class FastMRUCache<K, V> extends FastCollection implements Reusable
 	
 	private FastMap<K, CacheNode> _cache = new FastMap<K, CacheNode>().setKeyComparator(FastComparator.DIRECT);
 	private FastMap<K, V> _map;
-	private FastList<K> _mruList = new FastList<K>();
+	private FastList<K> _mruList = new FastList<>();
 	private int _cacheSize;
 	private int _forgetTime;
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/cache/HtmCache.java

@@ -50,11 +50,11 @@ public class HtmCache
 	{
 		if (Config.LAZY_CACHE)
 		{
-			_cache = new L2TIntObjectHashMap<String>();
+			_cache = new L2TIntObjectHashMap<>();
 		}
 		else
 		{
-			_cache = new TIntObjectHashMap<String>();
+			_cache = new TIntObjectHashMap<>();
 		}
 		reload();
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/BB/Forum.java

@@ -68,8 +68,8 @@ public class Forum
 	{
 		_forumId = Forumid;
 		_fParent = FParent;
-		_children = new FastList<Forum>();
-		_topic = new FastMap<Integer, Topic>();
+		_children = new FastList<>();
+		_topic = new FastMap<>();
 		
 		/*load();
 		getChildren();	*/
@@ -92,8 +92,8 @@ public class Forum
 		_forumPerm = perm;
 		_fParent = parent;
 		_ownerID = OwnerID;
-		_children = new FastList<Forum>();
-		_topic = new FastMap<Integer, Topic>();
+		_children = new FastList<>();
+		_topic = new FastMap<>();
 		parent._children.add(this);
 		ForumsBBSManager.getInstance().addForum(this);
 		_loaded = true;

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/BB/Post.java

@@ -58,7 +58,7 @@ public class Post
 	 */
 	public Post(String _PostOwner,int _PostOwnerID,long date,int tid,int _PostForumID,String txt)
 	{
-		_post = new FastList<CPost>();
+		_post = new FastList<>();
 		CPost cp = new CPost();
 		cp.postId = 0;
 		cp.postOwner = _PostOwner;
@@ -97,9 +97,10 @@ public class Post
 			L2DatabaseFactory.close(con);
 		}
 	}
+	
 	public Post(Topic t)
 	{
-		_post = new FastList<CPost>();
+		_post = new FastList<>();
 		load(t);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/BaseBBSManager.java

@@ -82,7 +82,7 @@ public abstract class BaseBBSManager
 	 */
 	protected void send1002(L2PcInstance activeChar, String string, String string2, String string3)
 	{
-		List<String> _arg = new FastList<String>();
+		List<String> _arg = new FastList<>();
 		_arg.add("0");
 		_arg.add("0");
 		_arg.add("0");

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/ForumsBBSManager.java

@@ -43,7 +43,7 @@ public class ForumsBBSManager extends BaseBBSManager
 	
 	protected ForumsBBSManager()
 	{
-		_table = new FastList<Forum>();
+		_table = new FastList<>();
 		
 		Connection con = null;
 		try

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/PostBBSManager.java

@@ -36,7 +36,7 @@ public class PostBBSManager extends BaseBBSManager
 	
 	protected PostBBSManager()
 	{
-		_postByTopic = new FastMap<Topic, Post>();
+		_postByTopic = new FastMap<>();
 	}
 	
 	public Post getGPosttByTopic(Topic t)

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java

@@ -277,7 +277,7 @@ public class RegionBBSManager extends BaseBBSManager
 	
 	public void changeCommunityBoard()
 	{
-		final FastList<L2PcInstance> sortedPlayers = new FastList<L2PcInstance>();
+		final FastList<L2PcInstance> sortedPlayers = new FastList<>();
 		final TIntObjectIterator<L2PcInstance> it = L2World.getInstance().getAllPlayers().iterator();
 		while (it.hasNext())
 		{
@@ -329,7 +329,7 @@ public class RegionBBSManager extends BaseBBSManager
 		
 		if (!added)
 		{
-			FastList<L2PcInstance> temp = new FastList<L2PcInstance>();
+			FastList<L2PcInstance> temp = new FastList<>();
 			int page = _onlinePlayers.size() + 1;
 			if (temp.add(player))
 			{
@@ -352,7 +352,7 @@ public class RegionBBSManager extends BaseBBSManager
 		
 		for (int page : _onlinePlayers.keySet())
 		{
-			FastMap<String, String> communityPage = new FastMap<String, String>();
+			FastMap<String, String> communityPage = new FastMap<>();
 			htmlCode.setLength(0);
 			StringUtil.append(htmlCode, "<html><body><br>" + "<table>" + trOpen + "<td align=left valign=top>Server Restarted: ", String.valueOf(GameServer.dateTimeServerStarted.getTime()), tdClose
 					+ trClose + "</table>" + "<table>" + trOpen + tdOpen + "XP Rate: x", String.valueOf(Config.RATE_XP), tdClose

L2J_Server_BETA/java/com/l2jserver/gameserver/communitybbs/Manager/TopicBBSManager.java

@@ -44,7 +44,7 @@ public class TopicBBSManager extends BaseBBSManager
 	
 	protected TopicBBSManager()
 	{
-		_table = new FastList<Topic>();
+		_table = new FastList<>();
 		_maxId = new FastMap<Forum, Integer>().shared();
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AdminTable.java

@@ -44,7 +44,7 @@ public class AdminTable extends DocumentParser
 {
 	private static final Map<Integer, L2AccessLevel> _accessLevels = new HashMap<>();
 	private static final Map<String, L2AdminCommandAccessRight> _adminCommandAccessRights = new HashMap<>();
-	private static final FastMap<L2PcInstance, Boolean> _gmList = new FastMap<L2PcInstance, Boolean>();
+	private static final FastMap<L2PcInstance, Boolean> _gmList = new FastMap<>();
 	private int _highestLevel = 0;
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/AugmentationData.java

@@ -109,7 +109,7 @@ public class AugmentationData
 	private final List<List<Integer>> _redSkills = new ArrayList<>(10);
 	private final List<List<Integer>> _yellowSkills = new ArrayList<>(10);
 	
-	private final TIntObjectHashMap<AugmentationSkill> _allSkills = new TIntObjectHashMap<AugmentationSkill>();
+	private final TIntObjectHashMap<AugmentationSkill> _allSkills = new TIntObjectHashMap<>();
 	
 	protected AugmentationData()
 	{		
@@ -403,7 +403,7 @@ public class AugmentationData
 										String tableName = attrs.getNamedItem("name").getNodeValue();
 										
 										StringTokenizer data = new StringTokenizer(cd.getFirstChild().getNodeValue());
-										FastList<Float> array = new FastList<Float>();
+										FastList<Float> array = new FastList<>();
 										while (data.hasMoreTokens())
 										{
 											array.add(Float.parseFloat(data.nextToken()));
@@ -481,7 +481,7 @@ public class AugmentationData
 										String tableName = attrs.getNamedItem("name").getNodeValue();
 										
 										StringTokenizer data = new StringTokenizer(cd.getFirstChild().getNodeValue());
-										FastList<Float> array = new FastList<Float>();
+										FastList<Float> array = new FastList<>();
 										while (data.hasMoreTokens())
 										{
 											array.add(Float.parseFloat(data.nextToken()));
@@ -816,7 +816,7 @@ public class AugmentationData
 	 */
 	public FastList<AugStat> getAugStatsById(int augmentationId)
 	{
-		FastList<AugStat> temp = new FastList<AugStat>();
+		FastList<AugStat> temp = new FastList<>();
 		// An augmentation id contains 2 short values so we have to separate them here
 		// both values contain a number from 1-16380, the first 14560 values are stats
 		// the 14560 stats are divided into 4 blocks each holding 3640 values

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/CharNameTable.java

@@ -44,8 +44,8 @@ public class CharNameTable
 	
 	protected CharNameTable()
 	{
-		_chars = new FastMap<Integer, String>();
-		_accessLevels = new FastMap<Integer, Integer>();
+		_chars = new FastMap<>();
+		_accessLevels = new FastMap<>();
 		if (Config.CACHE_CHAR_NAMES)
 			loadAll();
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/DoorTable.java

@@ -37,9 +37,9 @@ public class DoorTable extends DocumentParser
 {
 	private static final Logger _log = Logger.getLogger(DoorTable.class.getName());
 	
-	private final TIntObjectHashMap<L2DoorInstance> _doors = new TIntObjectHashMap<L2DoorInstance>();
-	private static final TIntObjectHashMap<Set<Integer>> _groups = new TIntObjectHashMap<Set<Integer>>();
-	private final TIntObjectHashMap<ArrayList<L2DoorInstance>> _regions = new TIntObjectHashMap<ArrayList<L2DoorInstance>>();
+	private final TIntObjectHashMap<L2DoorInstance> _doors = new TIntObjectHashMap<>();
+	private static final TIntObjectHashMap<Set<Integer>> _groups = new TIntObjectHashMap<>();
+	private final TIntObjectHashMap<ArrayList<L2DoorInstance>> _regions = new TIntObjectHashMap<>();
 	
 	protected DoorTable()
 	{
@@ -140,7 +140,7 @@ public class DoorTable extends DocumentParser
 			_regions.get(region).add(door);
 		else
 		{
-			final ArrayList<L2DoorInstance> list = new ArrayList<L2DoorInstance>();
+			final ArrayList<L2DoorInstance> list = new ArrayList<>();
 			list.add(door);
 			_regions.put(region, list);
 		}
@@ -151,7 +151,7 @@ public class DoorTable extends DocumentParser
 		Set<Integer> set = _groups.get(groupName.hashCode());
 		if (set == null)
 		{
-			set = new HashSet<Integer>();
+			set = new HashSet<>();
 			set.add(doorId);
 			_groups.put(groupName.hashCode(), set);
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantGroupsTable.java

@@ -69,8 +69,8 @@ public class EnchantGroupsTable
 			con = L2DatabaseFactory.getInstance().getConnection();
 			try
 			{
-				_enchantSkillGroups = new TIntObjectHashMap<L2EnchantSkillGroup>();
-				_enchantSkillTrees = new TIntObjectHashMap<L2EnchantSkillLearn>();
+				_enchantSkillGroups = new TIntObjectHashMap<>();
+				_enchantSkillTrees = new TIntObjectHashMap<>();
 				
 				PreparedStatement statement = con.prepareStatement("SELECT group_id, level, adena, exp, sp, success_rate76, success_rate77, success_rate78, success_rate79, success_rate80, success_rate81, success_rate82, success_rate83, success_rate84, success_rate85 FROM enchant_skill_groups ORDER BY group_id, level");
 				ResultSet enchantGroups = statement.executeQuery();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantHPBonusData.java

@@ -42,7 +42,7 @@ public class EnchantHPBonusData
 {
 	protected static final Logger _log = Logger.getLogger(EnchantHPBonusData.class.getName());
 	
-	private final TIntObjectHashMap<Integer[]> _armorHPBonus = new TIntObjectHashMap<Integer[]>();
+	private final TIntObjectHashMap<Integer[]> _armorHPBonus = new TIntObjectHashMap<>();
 	private static final float fullArmorModifier = 1.5f;
 	
 	public static final EnchantHPBonusData getInstance()

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EnchantItemData.java

@@ -75,7 +75,7 @@ public class EnchantItemData extends DocumentParser
 							set.set(att.getNodeName(), att.getNodeValue());
 						}
 						
-						List<Integer> items = new ArrayList<Integer>();
+						List<Integer> items = new ArrayList<>();
 						
 						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling())
 						{
@@ -98,7 +98,7 @@ public class EnchantItemData extends DocumentParser
 							set.set(att.getNodeName(), att.getNodeValue());
 						}
 						
-						List<Integer> items = new ArrayList<Integer>();
+						List<Integer> items = new ArrayList<>();
 						
 						for (Node cd = d.getFirstChild(); cd != null; cd = cd.getNextSibling())
 						{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/EventDroplist.java

@@ -37,7 +37,7 @@ public class EventDroplist
 	/**
 	 * The table containing all DataDrop object
 	 */
-	private static final List<DateDrop> _allNpcDateDrops = new FastList<DateDrop>();
+	private static final List<DateDrop> _allNpcDateDrops = new FastList<>();
 	
 	public static class DateDrop
 	{
@@ -94,7 +94,7 @@ public class EventDroplist
 	 */
 	public List<DateDrop> getAllDrops()
 	{
-		final List<DateDrop> list = new FastList<DateDrop>();
+		final List<DateDrop> list = new FastList<>();
 		final Date currentDate = new Date();
 		for (DateDrop drop : _allNpcDateDrops)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/FishData.java

@@ -111,7 +111,7 @@ public final class FishData extends DocumentParser
 	 */
 	public List<L2Fish> getFish(int level, int group, int grade)
 	{
-		final ArrayList<L2Fish> result = new ArrayList<L2Fish>();
+		final ArrayList<L2Fish> result = new ArrayList<>();
 		Map<Integer, L2Fish> fish = null;
 		switch (grade)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HelperBuffTable.java

@@ -66,7 +66,7 @@ public class HelperBuffTable
 	 */
 	protected HelperBuffTable()
 	{
-		_helperBuff = new FastList<L2HelperBuff>();
+		_helperBuff = new FastList<>();
 		restoreHelperBuffData();
 		
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/HerbDropTable.java

@@ -46,7 +46,7 @@ public class HerbDropTable
 	
 	protected HerbDropTable()
 	{
-		_herbGroups = new TIntObjectHashMap<FastList<L2DropCategory>>();
+		_herbGroups = new TIntObjectHashMap<>();
 		restoreData();
 	}
 	
@@ -73,7 +73,7 @@ public class HerbDropTable
 					category = _herbGroups.get(groupId);
 				else
 				{
-					category = new FastList<L2DropCategory>();
+					category = new FastList<>();
 					_herbGroups.put(groupId, category);
 				}
 				

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/ItemTable.java

@@ -63,11 +63,11 @@ public class ItemTable
 	
 	private static FastList<NewItemListener> newItemListeners = new FastList<NewItemListener>().shared();
 	
-	public static final Map<String, Integer> _materials = new FastMap<String, Integer>();
-	public static final Map<String, Integer> _crystalTypes = new FastMap<String, Integer>();
-	public static final Map<String, Integer> _slots = new FastMap<String, Integer>();
-	public static final Map<String, L2WeaponType> _weaponTypes = new FastMap<String, L2WeaponType>();
-	public static final Map<String, L2ArmorType> _armorTypes = new FastMap<String, L2ArmorType>();
+	public static final Map<String, Integer> _materials = new FastMap<>();
+	public static final Map<String, Integer> _crystalTypes = new FastMap<>();
+	public static final Map<String, Integer> _slots = new FastMap<>();
+	public static final Map<String, L2WeaponType> _weaponTypes = new FastMap<>();
+	public static final Map<String, L2ArmorType> _armorTypes = new FastMap<>();
 	
 	
 	private L2Item[] _allTemplates;
@@ -188,9 +188,9 @@ public class ItemTable
 	 */
 	protected ItemTable()
 	{
-		_etcItems = new FastMap<Integer, L2EtcItem>();
-		_armors = new FastMap<Integer, L2Armor>();
-		_weapons = new FastMap<Integer, L2Weapon>();
+		_etcItems = new FastMap<>();
+		_armors = new FastMap<>();
+		_weapons = new FastMap<>();
 		load();
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/LevelUpData.java

@@ -58,7 +58,7 @@ public class LevelUpData
 	
 	protected LevelUpData()
 	{
-		_lvlTable = new TIntObjectHashMap<L2LvlupData>();
+		_lvlTable = new TIntObjectHashMap<>();
 		Connection con = null;
 		try
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/MerchantPriceConfigTable.java

@@ -49,7 +49,7 @@ public class MerchantPriceConfigTable implements InstanceListManager
 	
 	private static final String MPCS_FILE = "MerchantPriceConfig.xml";
 	
-	private Map<Integer, MerchantPriceConfig> _mpcs = new FastMap<Integer, MerchantPriceConfig>();
+	private Map<Integer, MerchantPriceConfig> _mpcs = new FastMap<>();
 	private MerchantPriceConfig _defaultMpc;
 	
 	public MerchantPriceConfig getMerchantPriceConfig(L2MerchantInstance npc)

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/MultiSell.java

@@ -63,7 +63,7 @@ public class MultiSell
 	
 	protected MultiSell()
 	{
-		_entries = new TIntObjectHashMap<ListContainer>();
+		_entries = new TIntObjectHashMap<>();
 		load();
 	}
 	
@@ -215,7 +215,7 @@ public class MultiSell
 	{
 		Document doc = null;
 		int id = 0;
-		List<File> files = new FastList<File>();
+		List<File> files = new FastList<>();
 		hashFiles("data/multisell", files);
 		if (Config.CUSTOM_MULTISELL_LOAD)
 			hashFiles("data/multisell/custom", files);

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcBufferTable.java

@@ -30,7 +30,7 @@ public class NpcBufferTable
 {
 	private static Logger _log = Logger.getLogger(NpcBufferTable.class.getName());
 	
-	private final TIntObjectHashMap<NpcBufferSkills> _buffers = new TIntObjectHashMap<NpcBufferSkills>();
+	private final TIntObjectHashMap<NpcBufferSkills> _buffers = new TIntObjectHashMap<>();
 	
 	private static class NpcBufferSkills
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcTable.java

@@ -45,7 +45,7 @@ public class NpcTable
 {
 	private static final Logger _log = Logger.getLogger(NpcTable.class.getName());
 	
-	private final TIntObjectHashMap<L2NpcTemplate> _npcs = new TIntObjectHashMap<L2NpcTemplate>();
+	private final TIntObjectHashMap<L2NpcTemplate> _npcs = new TIntObjectHashMap<>();
 	
 	protected NpcTable()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTable.java

@@ -41,7 +41,7 @@ public class SkillTable
 	
 	protected SkillTable()
 	{
-		_skills = new TIntObjectHashMap<L2Skill>();
+		_skills = new TIntObjectHashMap<>();
 		_skillMaxLevel = new TIntIntHashMap();
 		_enchantable = new TIntArrayList();
 		load();

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

@@ -1037,7 +1037,7 @@ public final class SkillTreesData extends DocumentParser
 		// Class specific skills:
 		Map<Integer, L2SkillLearn> tempMap;
 		final Set<ClassId> keySet = _classSkillTrees.keySet();
-		_skillsByClassIdHashCodes = new TIntObjectHashMap<int[]>(keySet.size());
+		_skillsByClassIdHashCodes = new TIntObjectHashMap<>(keySet.size());
 		for (ClassId cls : keySet)
 		{
 			i = 0;
@@ -1054,7 +1054,7 @@ public final class SkillTreesData extends DocumentParser
 		
 		// Race specific skills from Fishing and Transformation skill trees.
 		final List<Integer> list = new ArrayList<>();
-		_skillsByRaceHashCodes = new TIntObjectHashMap<int[]>(Race.values().length);
+		_skillsByRaceHashCodes = new TIntObjectHashMap<>(Race.values().length);
 		for (Race r : Race.values())
 		{
 			for (L2SkillLearn s : _fishingSkillTree.values())

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonEffectsTable.java

@@ -33,7 +33,7 @@ public class SummonEffectsTable
 	 * 		key: classIndex, value: servitors Map
 	 * 			key: servitorSkillId, value: Effects list
 	 */
-	private TIntObjectHashMap<TIntObjectHashMap<TIntObjectHashMap<List<SummonEffect>>>> _servitorEffects = new TIntObjectHashMap<TIntObjectHashMap<TIntObjectHashMap<List<SummonEffect>>>>();
+	private TIntObjectHashMap<TIntObjectHashMap<TIntObjectHashMap<List<SummonEffect>>>> _servitorEffects = new TIntObjectHashMap<>();
 	
 	public TIntObjectHashMap<TIntObjectHashMap<TIntObjectHashMap<List<SummonEffect>>>> getServitorEffectsOwner()
 	{
@@ -51,7 +51,7 @@ public class SummonEffectsTable
 	}
 	
 	/** Pets **/
-	private TIntObjectHashMap<List<SummonEffect>> _petEffects = new TIntObjectHashMap<List<SummonEffect>>(); // key: petItemObjectId, value: Effects list
+	private TIntObjectHashMap<List<SummonEffect>> _petEffects = new TIntObjectHashMap<>(); // key: petItemObjectId, value: Effects list
 	
 	public TIntObjectHashMap<List<SummonEffect>> getPetEffects()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonItemsData.java

@@ -29,7 +29,7 @@ import com.l2jserver.gameserver.model.L2SummonItem;
 public class SummonItemsData
 {
 	protected static final Logger _log = Logger.getLogger(SummonItemsData.class.getName());
-	private final TIntObjectHashMap<L2SummonItem> _summonitems = new TIntObjectHashMap<L2SummonItem>();
+	private final TIntObjectHashMap<L2SummonItem> _summonitems = new TIntObjectHashMap<>();
 	
 	public static SummonItemsData getInstance()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SummonSkillsTable.java

@@ -46,7 +46,7 @@ public class SummonSkillsTable
 	
 	protected SummonSkillsTable()
 	{
-		_skillTrees = new FastMap<Integer, Map<Integer, L2PetSkillLearn>>();
+		_skillTrees = new FastMap<>();
 		load();
 	}
 	
@@ -69,7 +69,7 @@ public class SummonSkillsTable
 				PreparedStatement statement2 = con.prepareStatement("SELECT minLvl, skillId, skillLvl FROM pets_skills where templateId=? ORDER BY skillId, skillLvl");
 				while (petlist.next())
 				{
-					map = new FastMap<Integer, L2PetSkillLearn>();
+					map = new FastMap<>();
 					npcId = petlist.getInt("id");
 					statement2.setInt(1, npcId);
 					ResultSet skilltree = statement2.executeQuery();
@@ -151,7 +151,7 @@ public class SummonSkillsTable
 	
 	public FastList<Integer> getAvailableSkills(L2Summon cha)
 	{
-		FastList<Integer> skillIds = new FastList<Integer>();
+		FastList<Integer> skillIds = new FastList<>();
 		if (!_skillTrees.containsKey(cha.getNpcId()))
 		{
 			_log.warning("Pet id " + cha.getNpcId() + " does not have any skills assigned.");

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/TeleportLocationTable.java

@@ -49,7 +49,7 @@ public class TeleportLocationTable
 	
 	public void reloadAll()
 	{
-		_teleports = new TIntObjectHashMap<L2TeleportLocation>();
+		_teleports = new TIntObjectHashMap<>();
 		
 		Connection con = null;
 		try

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentBase.java

@@ -134,7 +134,7 @@ public abstract class DocumentBase
 	protected DocumentBase(File pFile)
 	{
 		_file = pFile;
-		_tables = new FastMap<String, String[]>();
+		_tables = new FastMap<>();
 	}
 	
 	public Document parse()
@@ -174,7 +174,7 @@ public abstract class DocumentBase
 	
 	protected void resetTable()
 	{
-		_tables = new FastMap<String, String[]>();
+		_tables = new FastMap<>();
 	}
 	
 	protected void setTable(String name, String[] table)
@@ -636,7 +636,7 @@ public abstract class DocumentBase
 			else if ("clanHall".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -701,7 +701,7 @@ public abstract class DocumentBase
 			else if ("class_id_restriction".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -717,7 +717,7 @@ public abstract class DocumentBase
 			else if ("instanceId".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -738,7 +738,7 @@ public abstract class DocumentBase
 			else if ("hasPet".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -749,7 +749,7 @@ public abstract class DocumentBase
 			else if ("servitorNpcId".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -776,7 +776,7 @@ public abstract class DocumentBase
 			else if ("insideZoneId".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -822,7 +822,7 @@ public abstract class DocumentBase
 			else if ("class_id_restriction".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -868,7 +868,7 @@ public abstract class DocumentBase
 			else if ("race_id".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -919,7 +919,7 @@ public abstract class DocumentBase
 			else if ("npcId".equalsIgnoreCase(a.getNodeName()))
 			{
 				StringTokenizer st = new StringTokenizer(a.getNodeValue(), ",");
-				ArrayList<Integer> array = new ArrayList<Integer>(st.countTokens());
+				ArrayList<Integer> array = new ArrayList<>(st.countTokens());
 				while (st.hasMoreTokens())
 				{
 					String item = st.nextToken().trim();
@@ -1050,7 +1050,7 @@ public abstract class DocumentBase
 		String name = attrs.getNamedItem("name").getNodeValue();
 		if (name.charAt(0) != '#') throw new IllegalArgumentException("Table name must start with #");
 		StringTokenizer data = new StringTokenizer(n.getFirstChild().getNodeValue());
-		List<String> array = new ArrayList<String>(data.countTokens());
+		List<String> array = new ArrayList<>(data.countTokens());
 		while (data.hasMoreTokens())
 			array.add(data.nextToken());
 		setTable(name, array.toArray(new String[array.size()]));

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/DocumentEngine.java

@@ -37,8 +37,8 @@ public class DocumentEngine
 {
 	private static final Logger _log = Logger.getLogger(DocumentEngine.class.getName());
 	
-	private final List<File> _itemFiles = new FastList<File>();
-	private final List<File> _skillFiles = new FastList<File>();
+	private final List<File> _itemFiles = new FastList<>();
+	private final List<File> _skillFiles = new FastList<>();
 	
 	public static DocumentEngine getInstance()
 	{
@@ -107,7 +107,7 @@ public class DocumentEngine
 	 */
 	public List<L2Item> loadItems()
 	{
-		List<L2Item> list = new FastList<L2Item>();
+		List<L2Item> list = new FastList<>();
 		for (File f : _itemFiles)
 		{
 			DocumentItem document = new DocumentItem(f);

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/items/DocumentItem.java

@@ -36,7 +36,7 @@ import com.l2jserver.gameserver.model.items.L2Item;
 public final class DocumentItem extends DocumentBase
 {
 	private Item _currentItem = null;
-	private List<L2Item> _itemsInFile = new FastList<L2Item>();
+	private List<L2Item> _itemsInFile = new FastList<>();
 	
 	/**
 	 * @param file

L2J_Server_BETA/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java

@@ -50,12 +50,12 @@ public class DocumentSkill extends DocumentBase
 		public StatsSet[]           enchsets7;
 		public StatsSet[]           enchsets8;
 		public int                  currentLevel;
-		public List<L2Skill>   skills          = new FastList<L2Skill>();
-		public List<L2Skill>   currentSkills   = new FastList<L2Skill>();
+		public List<L2Skill>   skills          = new FastList<>();
+		public List<L2Skill>   currentSkills   = new FastList<>();
 	}
 	
 	private Skill _currentSkill;
-	private List<L2Skill> _skillsInFile  = new FastList<L2Skill>();
+	private List<L2Skill> _skillsInFile  = new FastList<>();
 	
 	public DocumentSkill(File file)
 	{
@@ -766,7 +766,7 @@ public class DocumentSkill extends DocumentBase
 	private void makeSkills()
 	{
 		int count = 0;
-		_currentSkill.currentSkills = new FastList<L2Skill>(_currentSkill.sets.length+_currentSkill.enchsets1.length+_currentSkill.enchsets2.length+_currentSkill.enchsets3.length+_currentSkill.enchsets4.length+_currentSkill.enchsets5.length+_currentSkill.enchsets6.length+_currentSkill.enchsets7.length+_currentSkill.enchsets8.length);
+		_currentSkill.currentSkills = new FastList<>(_currentSkill.sets.length+_currentSkill.enchsets1.length+_currentSkill.enchsets2.length+_currentSkill.enchsets3.length+_currentSkill.enchsets4.length+_currentSkill.enchsets5.length+_currentSkill.enchsets6.length+_currentSkill.enchsets7.length+_currentSkill.enchsets8.length);
 		
 		for (int i=0; i < _currentSkill.sets.length; i++)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/geoeditorcon/GeoEditorThread.java

@@ -49,7 +49,7 @@ public class GeoEditorThread extends Thread
 	{
 		_geSocket = ge;
 		_working = true;
-		_gms = new FastList<L2PcInstance>();
+		_gms = new FastList<>();
 	}
 	
 	@Override

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionHandler.java

@@ -31,7 +31,7 @@ public class ActionHandler
 	
 	protected ActionHandler()
 	{
-		_actions = new FastMap<InstanceType, IActionHandler>();
+		_actions = new FastMap<>();
 	}
 	
 	public void registerHandler(IActionHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ActionShiftHandler.java

@@ -34,7 +34,7 @@ public class ActionShiftHandler
 	
 	protected ActionShiftHandler()
 	{
-		_actionsShift = new FastMap<InstanceType, IActionHandler>();
+		_actionsShift = new FastMap<>();
 	}
 	
 	public void registerHandler(IActionHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/AdminCommandHandler.java

@@ -38,7 +38,7 @@ public class AdminCommandHandler
 	
 	protected AdminCommandHandler()
 	{
-		_datatable = new TIntObjectHashMap<IAdminCommandHandler>();
+		_datatable = new TIntObjectHashMap<>();
 	}
 	
 	public void registerHandler(IAdminCommandHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/BypassHandler.java

@@ -39,7 +39,7 @@ public class BypassHandler
 	
 	protected BypassHandler()
 	{
-		_datatable = new TIntObjectHashMap<IBypassHandler>();
+		_datatable = new TIntObjectHashMap<>();
 	}
 	
 	public void registerHandler(IBypassHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ChatHandler.java

@@ -41,7 +41,7 @@ public class ChatHandler
 	 */
 	protected ChatHandler()
 	{
-		_datatable = new TIntObjectHashMap<IChatHandler>();
+		_datatable = new TIntObjectHashMap<>();
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/EffectHandler.java

@@ -33,7 +33,7 @@ public final class EffectHandler
 	
 	protected EffectHandler()
 	{
-		_handlers = new FastMap<Integer, Class<? extends L2Effect>>();
+		_handlers = new FastMap<>();
 	}
 	
 	public void registerHandler(String name, Class<? extends L2Effect> func)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ItemHandler.java

@@ -50,7 +50,7 @@ public class ItemHandler
 	 */
 	protected ItemHandler()
 	{
-		_datatable = new TIntObjectHashMap<IItemHandler>();
+		_datatable = new TIntObjectHashMap<>();
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/SkillHandler.java

@@ -35,7 +35,7 @@ public class SkillHandler
 	
 	protected SkillHandler()
 	{
-		_datatable = new TIntObjectHashMap<ISkillHandler>();
+		_datatable = new TIntObjectHashMap<>();
 	}
 	
 	public void registerHandler(ISkillHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TargetHandler.java

@@ -34,7 +34,7 @@ public class TargetHandler
 	
 	protected TargetHandler()
 	{
-		_datatable = new FastMap<Enum<L2TargetType>, ITargetTypeHandler>();
+		_datatable = new FastMap<>();
 	}
 	
 	public void registerHandler(ITargetTypeHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TelnetHandler.java

@@ -30,7 +30,7 @@ public class TelnetHandler
 	
 	protected TelnetHandler()
 	{
-		_telnetHandlers = new TIntObjectHashMap<ITelnetHandler>();
+		_telnetHandlers = new TIntObjectHashMap<>();
 	}
 	
 	public void registerHandler(ITelnetHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/UserCommandHandler.java

@@ -38,7 +38,7 @@ public class UserCommandHandler
 	
 	protected UserCommandHandler()
 	{
-		_datatable = new TIntObjectHashMap<IUserCommandHandler>();
+		_datatable = new TIntObjectHashMap<>();
 	}
 	
 	public void registerHandler(IUserCommandHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/VoicedCommandHandler.java

@@ -38,7 +38,7 @@ public class VoicedCommandHandler
 	
 	protected VoicedCommandHandler()
 	{
-		_datatable = new TIntObjectHashMap<IVoicedCommandHandler>();
+		_datatable = new TIntObjectHashMap<>();
 	}
 	
 	public void registerHandler(IVoicedCommandHandler handler)

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AirShipManager.java

@@ -43,9 +43,9 @@ public class AirShipManager
 	private static final String UPDATE_DB = "UPDATE airships SET fuel=? WHERE owner_id=?";
 	
 	private L2CharTemplate _airShipTemplate = null;
-	private TIntObjectHashMap<StatsSet> _airShipsInfo = new TIntObjectHashMap<StatsSet>();
-	private TIntObjectHashMap<L2AirShipInstance> _airShips = new TIntObjectHashMap<L2AirShipInstance>();
-	private TIntObjectHashMap<AirShipTeleportList> _teleports = new TIntObjectHashMap<AirShipTeleportList>();
+	private TIntObjectHashMap<StatsSet> _airShipsInfo = new TIntObjectHashMap<>();
+	private TIntObjectHashMap<L2AirShipInstance> _airShips = new TIntObjectHashMap<>();
+	private TIntObjectHashMap<AirShipTeleportList> _teleports = new TIntObjectHashMap<>();
 	
 	public static final AirShipManager getInstance()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java

@@ -44,7 +44,7 @@ public class AntiFeedManager
 	protected AntiFeedManager()
 	{
 		_lastDeathTimes = new FastMap<Integer,Long>().shared();
-		_eventIPs = new TIntObjectHashMap<Map<Integer, Connections>>();
+		_eventIPs = new TIntObjectHashMap<>();
 	}
 	
 	/**

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/AuctionManager.java

@@ -86,7 +86,7 @@ public class AuctionManager
 	
 	protected AuctionManager()
 	{
-		_auctions = new FastList<Auction>();
+		_auctions = new FastList<>();
 		load();
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/BoatManager.java

@@ -32,7 +32,7 @@ import com.l2jserver.gameserver.network.serverpackets.L2GameServerPacket;
 
 public class BoatManager
 {
-	private Map<Integer, L2BoatInstance> _boats = new FastMap<Integer, L2BoatInstance>();
+	private Map<Integer, L2BoatInstance> _boats = new FastMap<>();
 	private boolean[] _docksBusy = new boolean[3];
 	
 	public static final int TALKING_ISLAND = 1;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManager.java

@@ -150,7 +150,7 @@ public class CastleManager implements InstanceListManager
 	public final List<Castle> getCastles()
 	{
 		if (_castles == null)
-			_castles = new FastList<Castle>();
+			_castles = new FastList<>();
 		return _castles;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CastleManorManager.java

@@ -211,10 +211,10 @@ public class CastleManorManager
 			PreparedStatement statementProcure = con.prepareStatement(CASTLE_MANOR_LOAD_PROCURE);
 			for (Castle castle : CastleManager.getInstance().getCastles())
 			{
-				FastList<SeedProduction> production = new FastList<SeedProduction>();
-				FastList<SeedProduction> productionNext = new FastList<SeedProduction>();
-				FastList<CropProcure> procure = new FastList<CropProcure>();
-				FastList<CropProcure> procureNext = new FastList<CropProcure>();
+				FastList<SeedProduction> production = new FastList<>();
+				FastList<SeedProduction> productionNext = new FastList<>();
+				FastList<CropProcure> procure = new FastList<>();
+				FastList<CropProcure> procureNext = new FastList<>();
 				
 				// restore seed production info
 				statementProduction.setInt(1, castle.getCastleId());
@@ -439,7 +439,7 @@ public class CastleManorManager
 			}
 			else
 			{
-				FastList<SeedProduction> production = new FastList<SeedProduction>();
+				FastList<SeedProduction> production = new FastList<>();
 				for (SeedProduction s : c.getSeedProduction(PERIOD_CURRENT))
 				{
 					s.setCanProduce(s.getStartProduce());
@@ -447,7 +447,7 @@ public class CastleManorManager
 				}
 				c.setSeedProduction(production, PERIOD_NEXT);
 				
-				FastList<CropProcure> procure = new FastList<CropProcure>();
+				FastList<CropProcure> procure = new FastList<>();
 				for (CropProcure cr : c.getCropProcure(PERIOD_CURRENT))
 				{
 					cr.setAmount(cr.getStartAmount());
@@ -537,7 +537,7 @@ public class CastleManorManager
 	
 	private FastList<SeedProduction> getNewSeedsList(int castleId)
 	{
-		FastList<SeedProduction> seeds = new FastList<SeedProduction>();
+		FastList<SeedProduction> seeds = new FastList<>();
 		FastList<Integer> seedsIds = L2Manor.getInstance().getSeedsForCastle(castleId);
 		for (int sd : seedsIds)
 		{
@@ -548,7 +548,7 @@ public class CastleManorManager
 	
 	private FastList<CropProcure> getNewCropsList(int castleId)
 	{
-		FastList<CropProcure> crops = new FastList<CropProcure>();
+		FastList<CropProcure> crops = new FastList<>();
 		FastList<Integer> cropsIds = L2Manor.getInstance().getCropsForCastle(castleId);
 		for (int cr : cropsIds)
 			crops.add(new CropProcure(cr));

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ClanHallManager.java

@@ -44,7 +44,7 @@ public final class ClanHallManager
 	private Map<Integer, AuctionableHall> _clanHall;
 	private Map<Integer, AuctionableHall> _freeClanHall;
 	private Map<Integer, AuctionableHall> _allAuctionableClanHalls;
-	private static Map<Integer, ClanHall> _allClanHalls = new FastMap<Integer, ClanHall>();
+	private static Map<Integer, ClanHall> _allClanHalls = new FastMap<>();
 	private boolean _loaded = false;
 	
 	public static ClanHallManager getInstance()
@@ -59,9 +59,9 @@ public final class ClanHallManager
 	
 	protected ClanHallManager()
 	{
-		_clanHall = new FastMap<Integer, AuctionableHall>();
-		_freeClanHall = new FastMap<Integer, AuctionableHall>();
-		_allAuctionableClanHalls = new FastMap<Integer, AuctionableHall>();
+		_clanHall = new FastMap<>();
+		_freeClanHall = new FastMap<>();
+		_allAuctionableClanHalls = new FastMap<>();
 		load();
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/CoupleManager.java

@@ -153,7 +153,7 @@ public class CoupleManager
 	public final FastList<Couple> getCouples()
 	{
 		if (_couples == null)
-			_couples = new FastList<Couple>();
+			_couples = new FastList<>();
 		return _couples;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DayNightSpawnManager.java

@@ -48,9 +48,9 @@ public class DayNightSpawnManager
 	
 	protected DayNightSpawnManager()
 	{
-		_dayCreatures = new ArrayList<L2Spawn>();
-		_nightCreatures = new ArrayList<L2Spawn>();
-		_bosses = new FastMap<L2Spawn, L2RaidBossInstance>();
+		_dayCreatures = new ArrayList<>();
+		_nightCreatures = new ArrayList<>();
+		_bosses = new FastMap<>();
 		
 		_log.info("DayNightSpawnManager: Day/Night handler initialized");
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DimensionalRiftManager.java

@@ -55,7 +55,7 @@ import com.l2jserver.util.Rnd;
 public class DimensionalRiftManager
 {
 	private static Logger _log = Logger.getLogger(DimensionalRiftManager.class.getName());
-	private final TByteObjectHashMap<TByteObjectHashMap<DimensionalRiftRoom>> _rooms = new TByteObjectHashMap<TByteObjectHashMap<DimensionalRiftRoom>>(7);
+	private final TByteObjectHashMap<TByteObjectHashMap<DimensionalRiftRoom>> _rooms = new TByteObjectHashMap<>(7);
 	private final int DIMENSIONAL_FRAGMENT_ITEM_ID = 7079;
 	
 	public static DimensionalRiftManager getInstance()
@@ -429,8 +429,8 @@ public class DimensionalRiftManager
 			_zMax = zMax;
 			_teleportCoords = new int[] { xT, yT, zT };
 			_isBossRoom = isBossRoom;
-			_roomSpawns = new FastList<L2Spawn>();
-			_roomMobs = new FastList<L2Npc>();
+			_roomSpawns = new FastList<>();
+			_roomMobs = new FastList<>();
 			_s = new Polygon(new int[] { xMin, xMax, xMax, xMin }, new int[] { yMin, yMin, yMax, yMax }, 4);
 		}
 		
@@ -550,7 +550,7 @@ public class DimensionalRiftManager
 	
 	public FastList<Byte> getFreeRooms(byte type)
 	{
-		FastList<Byte> list = new FastList<Byte>();
+		FastList<Byte> list = new FastList<>();
 		for (DimensionalRiftRoom room : _rooms.get(type).valueCollection())
 		{
 			if (!room.ispartyInside())

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/DuelManager.java

@@ -33,7 +33,7 @@ public class DuelManager
 	
 	protected DuelManager()
 	{
-		_duels = new FastList<Duel>();
+		_duels = new FastList<>();
 	}
 	
 	private int getNextDuelId()

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortManager.java

@@ -145,7 +145,7 @@ public class FortManager implements InstanceListManager
 	public final List<Fort> getForts()
 	{
 		if (_forts == null)
-			_forts = new FastList<Fort>();
+			_forts = new FastList<>();
 		return _forts;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeGuardManager.java

@@ -36,7 +36,7 @@ public class FortSiegeGuardManager
 	private static final Logger _log = Logger.getLogger(FortSiegeGuardManager.class.getName());
 	
 	private Fort _fort;
-	protected FastMap<Integer, FastList<L2Spawn>> _siegeGuards = new FastMap<Integer, FastList<L2Spawn>>();
+	protected FastMap<Integer, FastList<L2Spawn>> _siegeGuards = new FastMap<>();
 	protected FastList<L2Spawn> _siegeGuardsSpawns;
 	
 	public FortSiegeGuardManager(Fort fort)
@@ -111,7 +111,7 @@ public class FortSiegeGuardManager
 			
 			L2Spawn spawn1;
 			L2NpcTemplate template1;
-			_siegeGuardsSpawns = new FastList<L2Spawn>();
+			_siegeGuardsSpawns = new FastList<>();
 			while (rs.next())
 			{
 				int fortId = rs.getInt("fortId");

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FortSiegeManager.java

@@ -167,13 +167,13 @@ public class FortSiegeManager
 			_suspiciousMerchantRespawnDelay = Integer.decode(siegeSettings.getProperty("SuspiciousMerchantRespawnDelay", "180"));
 			
 			// Siege spawns settings
-			_commanderSpawnList = new FastMap<Integer, FastList<SiegeSpawn>>();
-			_flagList = new FastMap<Integer, FastList<CombatFlag>>();
+			_commanderSpawnList = new FastMap<>();
+			_flagList = new FastMap<>();
 			
 			for (Fort fort : FortManager.getInstance().getForts())
 			{
-				FastList<SiegeSpawn> _commanderSpawns = new FastList<SiegeSpawn>();
-				FastList<CombatFlag> _flagSpawns = new FastList<CombatFlag>();
+				FastList<SiegeSpawn> _commanderSpawns = new FastList<>();
+				FastList<CombatFlag> _flagSpawns = new FastList<>();
 				for (int i = 1; i < 5; i++)
 				{
 					String _spawnParams = siegeSettings.getProperty(fort.getName().replace(" ", "") + "Commander" + i, "");
@@ -292,14 +292,14 @@ public class FortSiegeManager
 	public final List<FortSiege> getSieges()
 	{
 		if (_sieges == null)
-			_sieges = new FastList<FortSiege>();
+			_sieges = new FastList<>();
 		return _sieges;
 	}
 	
 	public final void addSiege(FortSiege fortSiege)
 	{
 		if (_sieges == null)
-			_sieges = new FastList<FortSiege>();
+			_sieges = new FastList<>();
 		_sieges.add(fortSiege);
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/FourSepulchersManager.java

@@ -111,30 +111,30 @@ public class FourSepulchersManager
 				{ 25339, 175591, -72744, -7215, 49317 }
 			},
 	};
-	protected FastMap<Integer, Boolean> _archonSpawned = new FastMap<Integer, Boolean>();
-	protected FastMap<Integer, Boolean> _hallInUse = new FastMap<Integer, Boolean>();
-	protected FastMap<Integer, L2PcInstance> _challengers = new FastMap<Integer, L2PcInstance>();
-	protected TIntObjectHashMap<int []> _startHallSpawns = new TIntObjectHashMap<int []>();
+	protected FastMap<Integer, Boolean> _archonSpawned = new FastMap<>();
+	protected FastMap<Integer, Boolean> _hallInUse = new FastMap<>();
+	protected FastMap<Integer, L2PcInstance> _challengers = new FastMap<>();
+	protected TIntObjectHashMap<int []> _startHallSpawns = new TIntObjectHashMap<>();
 	protected TIntIntHashMap _hallGateKeepers = new TIntIntHashMap();
 	protected TIntIntHashMap _keyBoxNpc = new TIntIntHashMap();
 	protected TIntIntHashMap _victim = new TIntIntHashMap();
-	protected TIntObjectHashMap<L2Spawn> _executionerSpawns = new TIntObjectHashMap<L2Spawn>();
-	protected TIntObjectHashMap<L2Spawn> _keyBoxSpawns = new TIntObjectHashMap<L2Spawn>();
-	protected TIntObjectHashMap<L2Spawn> _mysteriousBoxSpawns = new TIntObjectHashMap<L2Spawn>();
-	protected TIntObjectHashMap<L2Spawn> _shadowSpawns = new TIntObjectHashMap<L2Spawn>();
-	protected TIntObjectHashMap<FastList<L2Spawn>> _dukeFinalMobs = new TIntObjectHashMap<FastList<L2Spawn>>();
-	protected TIntObjectHashMap<FastList<L2SepulcherMonsterInstance>> _dukeMobs = new TIntObjectHashMap<FastList<L2SepulcherMonsterInstance>>();
-	protected TIntObjectHashMap<FastList<L2Spawn>> _emperorsGraveNpcs = new TIntObjectHashMap<FastList<L2Spawn>>();
-	protected TIntObjectHashMap<FastList<L2Spawn>> _magicalMonsters = new TIntObjectHashMap<FastList<L2Spawn>>();
-	protected TIntObjectHashMap<FastList<L2Spawn>> _physicalMonsters = new TIntObjectHashMap<FastList<L2Spawn>>();
-	protected TIntObjectHashMap<FastList<L2SepulcherMonsterInstance>> _viscountMobs = new TIntObjectHashMap<FastList<L2SepulcherMonsterInstance>>();
+	protected TIntObjectHashMap<L2Spawn> _executionerSpawns = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<L2Spawn> _keyBoxSpawns = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<L2Spawn> _mysteriousBoxSpawns = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<L2Spawn> _shadowSpawns = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<FastList<L2Spawn>> _dukeFinalMobs = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<FastList<L2SepulcherMonsterInstance>> _dukeMobs = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<FastList<L2Spawn>> _emperorsGraveNpcs = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<FastList<L2Spawn>> _magicalMonsters = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<FastList<L2Spawn>> _physicalMonsters = new TIntObjectHashMap<>();
+	protected TIntObjectHashMap<FastList<L2SepulcherMonsterInstance>> _viscountMobs = new TIntObjectHashMap<>();
 	
 	protected FastList<L2Spawn> _physicalSpawns;
 	protected FastList<L2Spawn> _magicalSpawns;
 	protected FastList<L2Spawn> _managers;
 	protected FastList<L2Spawn> _dukeFinalSpawns;
 	protected FastList<L2Spawn> _emperorsGraveSpawns;
-	protected FastList<L2Npc> _allMobs = new FastList<L2Npc>();
+	protected FastList<L2Npc> _allMobs = new FastList<>();
 	
 	protected long _attackTimeEnd = 0;
 	protected long _coolDownTimeEnd = 0;
@@ -266,7 +266,7 @@ public class FourSepulchersManager
 	
 	protected void spawnManagers()
 	{
-		_managers = new FastList<L2Spawn>();
+		_managers = new FastList<>();
 		// L2Spawn spawnDat;
 		
 		int i = 31921;
@@ -523,7 +523,7 @@ public class FourSepulchersManager
 				L2Spawn spawnDat;
 				L2NpcTemplate template1;
 				
-				_physicalSpawns = new FastList<L2Spawn>();
+				_physicalSpawns = new FastList<>();
 				
 				while (rset2.next())
 				{
@@ -597,7 +597,7 @@ public class FourSepulchersManager
 				L2Spawn spawnDat;
 				L2NpcTemplate template1;
 				
-				_magicalSpawns = new FastList<L2Spawn>();
+				_magicalSpawns = new FastList<>();
 				
 				while (rset2.next())
 				{
@@ -671,7 +671,7 @@ public class FourSepulchersManager
 				L2Spawn spawnDat;
 				L2NpcTemplate template1;
 				
-				_dukeFinalSpawns = new FastList<L2Spawn>();
+				_dukeFinalSpawns = new FastList<>();
 				
 				while (rset2.next())
 				{
@@ -746,7 +746,7 @@ public class FourSepulchersManager
 				L2Spawn spawnDat;
 				L2NpcTemplate template1;
 				
-				_emperorsGraveSpawns = new FastList<L2Spawn>();
+				_emperorsGraveSpawns = new FastList<>();
 				
 				while (rset2.next())
 				{
@@ -1007,7 +1007,7 @@ public class FourSepulchersManager
 		
 		if (Config.FS_PARTY_MEMBER_COUNT > 1)
 		{
-			List<L2PcInstance> members = new FastList<L2PcInstance>();
+			List<L2PcInstance> members = new FastList<>();
 			for (L2PcInstance mem : player.getParty().getMembers())
 			{
 				if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true))
@@ -1043,7 +1043,7 @@ public class FourSepulchersManager
 		}
 		if (Config.FS_PARTY_MEMBER_COUNT <= 1 && player.isInParty())
 		{
-			List<L2PcInstance> members = new FastList<L2PcInstance>();
+			List<L2PcInstance> members = new FastList<>();
 			for (L2PcInstance mem : player.getParty().getMembers())
 			{
 				if (!mem.isDead() && Util.checkIfInRange(700, player, mem, true))
@@ -1122,7 +1122,7 @@ public class FourSepulchersManager
 			return;
 		
 		FastList<L2Spawn> monsterList;
-		FastList<L2SepulcherMonsterInstance> mobs = new FastList<L2SepulcherMonsterInstance>();
+		FastList<L2SepulcherMonsterInstance> mobs = new FastList<>();
 		L2Spawn keyBoxMobSpawn;
 		
 		if (Rnd.get(2) == 0)

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GlobalVariablesManager.java

@@ -35,7 +35,7 @@ public class GlobalVariablesManager
 	
 	protected GlobalVariablesManager()
 	{
-		_variablesMap = new FastMap<String, String>();
+		_variablesMap = new FastMap<>();
 		
 		loadVars();
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/GrandBossManager.java

@@ -107,10 +107,10 @@ public class GrandBossManager
 	
 	private void init()
 	{
-		_zones = new L2FastList<L2BossZone>();
+		_zones = new L2FastList<>();
 		
-		_bosses = new FastMap<Integer, L2GrandBossInstance>();
-		_storedInfo = new TIntObjectHashMap<StatsSet>();
+		_bosses = new FastMap<>();
+		_storedInfo = new TIntObjectHashMap<>();
 		_bossStatus = new TIntIntHashMap();
 		Connection con = null;
 		try
@@ -171,7 +171,7 @@ public class GrandBossManager
 	{
 		Connection con = null;
 		
-		FastMap<Integer, L2FastList<Integer>> zones = new FastMap<Integer, L2FastList<Integer>>();
+		FastMap<Integer, L2FastList<Integer>> zones = new FastMap<>();
 		
 		if (_zones == null)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HandysBlockCheckerManager.java

@@ -358,8 +358,8 @@ public final class HandysBlockCheckerManager
 		public ArenaParticipantsHolder(int arena)
 		{
 			_arena = arena;
-			_redPlayers = new ArrayList<L2PcInstance>(6);
-			_bluePlayers = new ArrayList<L2PcInstance>(6);
+			_redPlayers = new ArrayList<>(6);
+			_bluePlayers = new ArrayList<>(6);
 			_engine = new BlockCheckerEngine(this, _arena);
 		}
 		
@@ -375,7 +375,7 @@ public final class HandysBlockCheckerManager
 		
 		public ArrayList<L2PcInstance> getAllPlayers()
 		{
-			ArrayList<L2PcInstance> all = new ArrayList<L2PcInstance>(12);
+			ArrayList<L2PcInstance> all = new ArrayList<>(12);
 			all.addAll(_redPlayers);
 			all.addAll(_bluePlayers);
 			return all;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/HellboundManager.java

@@ -54,7 +54,7 @@ public class HellboundManager
 	
 	protected HellboundManager()
 	{
-		_population = new FastList<HellboundSpawn>();
+		_population = new FastList<>();
 		
 		loadData();
 		loadSpawns();

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/InstanceManager.java

@@ -245,7 +245,7 @@ public class InstanceManager extends DocumentParser
 	{
 		public int instanceId;
 		public int templateId = -1;
-		public FastList<Integer> allowed = new FastList<Integer>();
+		public FastList<Integer> allowed = new FastList<>();
 		public volatile int status;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemAuctionManager.java

@@ -52,7 +52,7 @@ public final class ItemAuctionManager
 	
 	protected ItemAuctionManager()
 	{
-		_managerInstances = new TIntObjectHashMap<ItemAuctionInstance>();
+		_managerInstances = new TIntObjectHashMap<>();
 		_auctionIds = new AtomicInteger(1);
 		
 		if (!Config.ALT_ITEM_AUCTION_ENABLED)

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ItemsOnGroundManager.java

@@ -48,7 +48,7 @@ public class ItemsOnGroundManager
 	{
 		if (Config.SAVE_DROPPED_ITEM)
 		{
-			_items = new FastList<L2ItemInstance>();
+			_items = new FastList<>();
 		}
 		if (Config.SAVE_DROPPED_ITEM_INTERVAL > 0)
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/MailManager.java

@@ -42,7 +42,7 @@ public class MailManager
 {
 	private static Logger _log = Logger.getLogger(MailManager.class.getName());
 	
-	private L2TIntObjectHashMap<Message> _messages = new L2TIntObjectHashMap<Message>();
+	private L2TIntObjectHashMap<Message> _messages = new L2TIntObjectHashMap<>();
 	
 	public static MailManager getInstance()
 	{
@@ -148,7 +148,7 @@ public class MailManager
 	
 	public final List<Message> getInbox(int objectId)
 	{
-		List<Message> inbox = new FastList<Message>();
+		List<Message> inbox = new FastList<>();
 		for (Message msg : getMessages())
 		{
 			if (msg != null
@@ -161,7 +161,7 @@ public class MailManager
 	
 	public final List<Message> getOutbox(int objectId)
 	{
-		List<Message> outbox = new FastList<Message>();
+		List<Message> outbox = new FastList<>();
 		for (Message msg : getMessages())
 		{
 			if (msg != null

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/PetitionManager.java

@@ -89,7 +89,7 @@ public final class PetitionManager
 		private PetitionState _state = PetitionState.Pending;
 		private String _content;
 		
-		private List<CreatureSay> _messageLog = new FastList<CreatureSay>();
+		private List<CreatureSay> _messageLog = new FastList<>();
 		
 		private L2PcInstance _petitioner;
 		private L2PcInstance _responder;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/QuestManager.java

@@ -35,7 +35,7 @@ public class QuestManager extends ScriptManager<Quest>
 		return SingletonHolder._instance;
 	}
 	
-	private Map<String, Quest> _quests = new FastMap<String, Quest>();
+	private Map<String, Quest> _quests = new FastMap<>();
 	
 	protected QuestManager()
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossPointsManager.java

@@ -61,7 +61,7 @@ public class RaidBossPointsManager
 	
 	private final void init()
 	{
-		_list = new FastMap<Integer, Map<Integer, Integer>>();
+		_list = new FastMap<>();
 		Connection con = null;
 		try
 		{
@@ -76,7 +76,7 @@ public class RaidBossPointsManager
 				Map<Integer, Integer> values = _list.get(charId);
 				if (values == null)
 				{
-					values = new FastMap<Integer, Integer>();
+					values = new FastMap<>();
 				}
 				values.put(bossId, points);
 				_list.put(charId, values);
@@ -124,7 +124,7 @@ public class RaidBossPointsManager
 		Map<Integer, Integer> tmpPoint = _list.get(ownerId);
 		if(tmpPoint == null)
 		{
-			tmpPoint = new FastMap<Integer, Integer>();
+			tmpPoint = new FastMap<>();
 			tmpPoint.put(bossId, points);
 			updatePointsInDB(player, bossId, points);
 		}
@@ -190,8 +190,8 @@ public class RaidBossPointsManager
 	
 	public Map<Integer, Integer> getRankList()
 	{
-		Map<Integer, Integer> tmpRanking = new FastMap<Integer, Integer>();
-		Map<Integer, Integer> tmpPoints = new FastMap<Integer, Integer>();
+		Map<Integer, Integer> tmpRanking = new FastMap<>();
+		Map<Integer, Integer> tmpPoints = new FastMap<>();
 		
 		for(int ownerId : _list.keySet())
 		{
@@ -201,7 +201,7 @@ public class RaidBossPointsManager
 				tmpPoints.put(ownerId, totalPoints);
 			}
 		}
-		ArrayList<Entry<Integer, Integer>> list = new ArrayList<Map.Entry<Integer, Integer>>(tmpPoints.entrySet());
+		ArrayList<Entry<Integer, Integer>> list = new ArrayList<>(tmpPoints.entrySet());
 		
 		Collections.sort(list, _comparator);
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/RaidBossSpawnManager.java

@@ -68,10 +68,10 @@ public class RaidBossSpawnManager
 	
 	private void init()
 	{
-		_bosses = new FastMap<Integer, L2RaidBossInstance>();
-		_schedules = new FastMap<Integer, ScheduledFuture<?>>();
-		_storedInfo = new FastMap<Integer, StatsSet>();
-		_spawns = new FastMap<Integer, L2Spawn>();
+		_bosses = new FastMap<>();
+		_schedules = new FastMap<>();
+		_storedInfo = new FastMap<>();
+		_spawns = new FastMap<>();
 		
 		Connection con = null;
 		try

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeGuardManager.java

@@ -35,7 +35,7 @@ public class SiegeGuardManager
 	private static Logger _log = Logger.getLogger(SiegeGuardManager.class.getName());
 	
 	private Castle _castle;
-	private List<L2Spawn> _siegeGuardSpawn = new FastList<L2Spawn>();
+	private List<L2Spawn> _siegeGuardSpawn = new FastList<>();
 	
 	public SiegeGuardManager(Castle castle)
 	{

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/SiegeManager.java

@@ -174,13 +174,13 @@ public class SiegeManager
 			_bloodAllianceReward = Integer.decode(siegeSettings.getProperty("BloodAllianceReward", "0"));
 			
 			// Siege spawns settings
-			_controlTowerSpawnList = new TIntObjectHashMap<FastList<SiegeSpawn>>();
-			_artefactSpawnList = new TIntObjectHashMap<FastList<SiegeSpawn>>();
-			_flameTowerSpawnList = new TIntObjectHashMap<FastList<SiegeSpawn>>();
+			_controlTowerSpawnList = new TIntObjectHashMap<>();
+			_artefactSpawnList = new TIntObjectHashMap<>();
+			_flameTowerSpawnList = new TIntObjectHashMap<>();
 			
 			for (Castle castle : CastleManager.getInstance().getCastles())
 			{
-				FastList<SiegeSpawn> _controlTowersSpawns = new FastList<SiegeSpawn>();
+				FastList<SiegeSpawn> _controlTowersSpawns = new FastList<>();
 				
 				for (int i = 1; i < 0xFF; i++)
 				{
@@ -207,7 +207,7 @@ public class SiegeManager
 					}
 				}
 				
-				FastList<SiegeSpawn> _flameTowersSpawns = new FastList<SiegeSpawn>();
+				FastList<SiegeSpawn> _flameTowersSpawns = new FastList<>();
 				
 				for (int i = 1; i < 0xFF; i++)
 				{
@@ -234,7 +234,7 @@ public class SiegeManager
 					}
 				}
 				
-				FastList<SiegeSpawn> _artefactSpawns = new FastList<SiegeSpawn>();
+				FastList<SiegeSpawn> _artefactSpawns = new FastList<>();
 				
 				for (int i = 1; i < 0xFF; i++)
 				{
@@ -341,7 +341,7 @@ public class SiegeManager
 	
 	public final List<Siege> getSieges()
 	{
-		FastList<Siege> sieges = new FastList<Siege>();
+		FastList<Siege> sieges = new FastList<>();
 		for (Castle castle : CastleManager.getInstance().getCastles())
 			sieges.add(castle.getSiege());
 		return sieges;

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TerritoryWarManager.java

@@ -92,7 +92,7 @@ public class TerritoryWarManager implements Siegable
 	protected FastList<Integer> _disguisedPlayers;
 	private FastList<TerritoryWard> _territoryWards;
 	private FastMap<L2Clan, L2SiegeFlagInstance> _clanFlags;
-	private Map<Integer,Integer[]> _participantPoints = new FastMap<Integer,Integer[]>();
+	private Map<Integer,Integer[]> _participantPoints = new FastMap<>();
 	protected Calendar _startTWDate = Calendar.getInstance();
 	protected boolean _isRegistrationOver = true;
 	protected boolean _isTWChannelOpen = false;
@@ -104,13 +104,13 @@ public class TerritoryWarManager implements Siegable
 	protected TerritoryWarManager()
 	{		
 		// init lists
-		_registeredClans = new FastMap<Integer, FastList<L2Clan>>();
-		_registeredMercenaries = new FastMap<Integer, FastList<Integer>>();
-		_territoryList = new FastMap<Integer, Territory>();
-		_territoryWards = new FastList<TerritoryWard>();
-		_clanFlags = new FastMap<L2Clan, L2SiegeFlagInstance>();
-		_disguisedPlayers = new FastList<Integer>();
-		TERRITORY_ITEM_IDS = new FastMap<Integer,Integer>();
+		_registeredClans = new FastMap<>();
+		_registeredMercenaries = new FastMap<>();
+		_territoryList = new FastMap<>();
+		_territoryWards = new FastList<>();
+		_clanFlags = new FastMap<>();
+		_disguisedPlayers = new FastList<>();
+		TERRITORY_ITEM_IDS = new FastMap<>();
 		
 		// Constant data
 		TERRITORY_ITEM_IDS.put(81, 13757);
@@ -204,7 +204,7 @@ public class TerritoryWarManager implements Siegable
 	
 	public FastList<Territory> getAllTerritories()
 	{
-		FastList<Territory> ret = new FastList<Territory>();
+		FastList<Territory> ret = new FastList<>();
 		for (Territory t : _territoryList.values())
 			if (t.getOwnerClan() != null)
 				ret.add(t);
@@ -850,7 +850,7 @@ public class TerritoryWarManager implements Siegable
 			_log.warning("TerritoryWarManager: TerritoryList is NULL!");
 			return;
 		}
-		FastList<Territory> activeTerritoryList = new FastList<Territory>();
+		FastList<Territory> activeTerritoryList = new FastList<>();
 		for(Territory t : _territoryList.values())
 		{
 			Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId());
@@ -929,7 +929,7 @@ public class TerritoryWarManager implements Siegable
 			_log.warning("TerritoryWarManager: TerritoryList is NULL!");
 			return;
 		}
-		FastList<Territory> activeTerritoryList = new FastList<Territory>();
+		FastList<Territory> activeTerritoryList = new FastList<>();
 		for(Territory t : _territoryList.values())
 		{
 			Castle castle = CastleManager.getInstance().getCastleById(t.getCastleId());
@@ -1361,7 +1361,7 @@ public class TerritoryWarManager implements Siegable
 		{
 			_castleId = castleId;
 			_territoryId = castleId + 80;
-			_spawnList = new FastList<TerritoryNPCSpawn>();
+			_spawnList = new FastList<>();
 			_territoryWardSpawnPlaces = new TerritoryNPCSpawn[9];
 			_questDone = new int[2];
 		}
@@ -1480,7 +1480,7 @@ public class TerritoryWarManager implements Siegable
 		
 		public FastList<Integer> getOwnedWardIds()
 		{
-			FastList<Integer> ret = new FastList<Integer>();
+			FastList<Integer> ret = new FastList<>();
 			for(TerritoryNPCSpawn wardSpawn : _territoryWardSpawnPlaces)
 				if (wardSpawn.getNpcId() > 0)
 					ret.add(wardSpawn.getNpcId());

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/TransformationManager.java

@@ -37,7 +37,7 @@ public class TransformationManager
 	
 	protected TransformationManager()
 	{
-		_transformations = new TIntObjectHashMap<L2Transformation>();
+		_transformations = new TIntObjectHashMap<>();
 	}
 	
 	public void report()

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -53,7 +53,7 @@ public class ZoneManager extends DocumentParser
 {
 	private static final Logger _log = Logger.getLogger(ZoneManager.class.getName());
 	
-	private final Map<Class<? extends L2ZoneType>, Map<Integer, ? extends L2ZoneType>> _classZones = new HashMap<Class<? extends L2ZoneType>, Map<Integer, ? extends L2ZoneType>>();
+	private final Map<Class<? extends L2ZoneType>, Map<Integer, ? extends L2ZoneType>> _classZones = new HashMap<>();
 	private int _lastDynamicId = 300000;
 	private List<L2ItemInstance> _debugItems;
 	
@@ -358,7 +358,7 @@ public class ZoneManager extends DocumentParser
 		Map<Integer, T> map = (Map<Integer, T>) _classZones.get(zone.getClass());
 		if (map == null)
 		{
-			map = new HashMap<Integer, T>();
+			map = new HashMap<>();
 			map.put(id, zone);
 			_classZones.put(zone.getClass(), map);
 		}
@@ -374,7 +374,7 @@ public class ZoneManager extends DocumentParser
 	@Deprecated
 	public Collection<L2ZoneType> getAllZones()
 	{
-		List<L2ZoneType> zones = new ArrayList<L2ZoneType>();
+		List<L2ZoneType> zones = new ArrayList<>();
 		for (Map<Integer, ? extends L2ZoneType> map : _classZones.values())
 		{
 			zones.addAll(map.values());
@@ -455,7 +455,7 @@ public class ZoneManager extends DocumentParser
 	public List<L2ZoneType> getZones(int x, int y)
 	{
 		L2WorldRegion region = L2World.getInstance().getRegion(x, y);
-		List<L2ZoneType> temp = new ArrayList<L2ZoneType>();
+		List<L2ZoneType> temp = new ArrayList<>();
 		for (L2ZoneType zone : region.getZones())
 		{
 			if (zone.isInsideZone(x, y))
@@ -474,7 +474,7 @@ public class ZoneManager extends DocumentParser
 	public List<L2ZoneType> getZones(int x, int y, int z)
 	{
 		L2WorldRegion region = L2World.getInstance().getRegion(x, y);
-		List<L2ZoneType> temp = new ArrayList<L2ZoneType>();
+		List<L2ZoneType> temp = new ArrayList<>();
 		for (L2ZoneType zone : region.getZones())
 		{
 			if (zone.isInsideZone(x, y, z))
@@ -564,7 +564,7 @@ public class ZoneManager extends DocumentParser
 	public List<L2ItemInstance> getDebugItems()
 	{
 		if (_debugItems == null)
-			_debugItems = new ArrayList<L2ItemInstance>();
+			_debugItems = new ArrayList<>();
 		return _debugItems;
 	}
 	

L2J_Server_BETA/java/com/l2jserver/gameserver/model/AutoChatHandler.java

@@ -56,7 +56,7 @@ public class AutoChatHandler implements SpawnListener
 	
 	protected AutoChatHandler()
 	{
-		_registeredChats = new FastMap<Integer, AutoChatInstance>();
+		_registeredChats = new FastMap<>();
 		restoreChatData();
 		L2Spawn.addSpawnListener(this);
 	}
@@ -125,7 +125,7 @@ public class AutoChatHandler implements SpawnListener
 		}
 		
 		// create clean list
-		_registeredChats = new FastMap<Integer, AutoChatInstance>();
+		_registeredChats = new FastMap<>();
 		
 		// load
 		restoreChatData();
@@ -303,7 +303,7 @@ public class AutoChatHandler implements SpawnListener
 		private boolean _globalChat = false;
 		private boolean _isActive;
 		
-		private Map<Integer, AutoChatDefinition> _chatDefinitions = new FastMap<Integer, AutoChatDefinition>();
+		private Map<Integer, AutoChatDefinition> _chatDefinitions = new FastMap<>();
 		protected ScheduledFuture<?> _chatTask;
 		
 		protected AutoChatInstance(int npcId, String[] chatTexts, long chatDelay, boolean isGlobal)
@@ -457,7 +457,7 @@ public class AutoChatHandler implements SpawnListener
 		 */
 		public L2Npc[] getNPCInstanceList()
 		{
-			List<L2Npc> npcInsts = new FastList<L2Npc>();
+			List<L2Npc> npcInsts = new FastList<>();
 			
 			for (AutoChatDefinition chatDefinition : _chatDefinitions.values())
 				npcInsts.add(chatDefinition._npcInstance);
@@ -724,8 +724,8 @@ public class AutoChatHandler implements SpawnListener
 					try
 					{
 						L2Npc chatNpc = chatDef._npcInstance;
-						List<L2PcInstance> nearbyPlayers = new FastList<L2PcInstance>();
-						List<L2PcInstance> nearbyGMs = new FastList<L2PcInstance>();
+						List<L2PcInstance> nearbyPlayers = new FastList<>();
+						List<L2PcInstance> nearbyGMs = new FastList<>();
 						
 						for (L2Character player : chatNpc.getKnownList().getKnownCharactersInRadius(1500))
 						{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/AutoSpawnHandler.java

@@ -80,8 +80,8 @@ public class AutoSpawnHandler
 	
 	protected AutoSpawnHandler()
 	{
-		_registeredSpawns = new FastMap<Integer, AutoSpawnInstance>();
-		_runningSpawns = new FastMap<Integer, ScheduledFuture<?>>();
+		_registeredSpawns = new FastMap<>();
+		_runningSpawns = new FastMap<>();
 		
 		restoreSpawnData();
 	}
@@ -112,8 +112,8 @@ public class AutoSpawnHandler
 		}
 		
 		// create clean list
-		_registeredSpawns = new FastMap<Integer, AutoSpawnInstance>();
-		_runningSpawns = new FastMap<Integer, ScheduledFuture<?>>();
+		_registeredSpawns = new FastMap<>();
+		_runningSpawns = new FastMap<>();
 		
 		// load
 		restoreSpawnData();
@@ -380,7 +380,7 @@ public class AutoSpawnHandler
 	
 	public Map<Integer, AutoSpawnInstance> getAutoSpawnInstances(int npcId)
 	{
-		Map<Integer, AutoSpawnInstance> spawnInstList = new FastMap<Integer, AutoSpawnInstance>();
+		Map<Integer, AutoSpawnInstance> spawnInstList = new FastMap<>();
 		
 		for (AutoSpawnInstance spawnInst : _registeredSpawns.values())
 			if (spawnInst.getNpcId() == npcId)
@@ -623,9 +623,9 @@ public class AutoSpawnHandler
 		
 		protected int _lastLocIndex = -1;
 		
-		private List<L2Npc> _npcList = new FastList<L2Npc>();
+		private List<L2Npc> _npcList = new FastList<>();
 		
-		private List<Location> _locList = new FastList<Location>();
+		private List<Location> _locList = new FastList<>();
 		
 		private boolean _spawnActive;
 		
@@ -705,7 +705,7 @@ public class AutoSpawnHandler
 		
 		public L2Spawn[] getSpawns()
 		{
-			List<L2Spawn> npcSpawns = new FastList<L2Spawn>();
+			List<L2Spawn> npcSpawns = new FastList<>();
 			
 			for (L2Npc npcInst : _npcList)
 				npcSpawns.add(npcInst.getSpawn());

L2J_Server_BETA/java/com/l2jserver/gameserver/model/BlockList.java

@@ -72,7 +72,7 @@ public class BlockList
 	private static List<Integer> loadList(int ObjId)
 	{
 		Connection con = null;
-		List<Integer> list = new FastList<Integer>();
+		List<Integer> list = new FastList<>();
 		
 		try
 		{

L2J_Server_BETA/java/com/l2jserver/gameserver/model/CharEffectList.java

@@ -569,8 +569,8 @@ public class CharEffectList
 	{
 		if (_queuesInitialized)
 			return;
-		_addQueue = new LinkedBlockingQueue<L2Effect>();
-		_removeQueue = new LinkedBlockingQueue<L2Effect>();
+		_addQueue = new LinkedBlockingQueue<>();
+		_removeQueue = new LinkedBlockingQueue<>();
 		_queuesInitialized = true;
 	}
 	
@@ -920,7 +920,7 @@ public class CharEffectList
 		L2Effect effectToAdd = null;
 		L2Effect effectToRemove = null;
 		if (_stackedEffects == null)
-			_stackedEffects = new FastMap<String, List<L2Effect>>();
+			_stackedEffects = new FastMap<>();
 		
 		// Get the list of all stacked effects corresponding to the stack type of the L2Effect to add
 		stackQueue = _stackedEffects.get(newEffect.getAbnormalType());
@@ -966,7 +966,7 @@ public class CharEffectList
 		}
 		else
 		{
-			stackQueue = new FastList<L2Effect>();
+			stackQueue = new FastList<>();
 			stackQueue.add(0, newEffect);
 		}