BETA: Removing uselss data restore during \//reload npcId <id> only Quests are enough

Also more FastList => ArrayList
And log.cfg update for [5291]

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

@@ -21,19 +21,15 @@ import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import javolution.util.FastList;
-
 import com.l2jserver.Config;
 import com.l2jserver.L2DatabaseFactory;
 import com.l2jserver.gameserver.model.Elementals;
-import com.l2jserver.gameserver.model.L2DropCategory;
 import com.l2jserver.gameserver.model.L2DropData;
 import com.l2jserver.gameserver.model.L2MinionData;
 import com.l2jserver.gameserver.model.L2NpcAIData;
@@ -145,28 +141,15 @@ public class NpcTable
 	 */
 	public void reloadNpc(int id)
 	{
+		Map<QuestEventType, List<Quest>> quests = null;
 		try
 		{
 			// save a copy of the old data
 			L2NpcTemplate old = getTemplate(id);
 			
-			Map<QuestEventType, List<Quest>> quests = new HashMap<>();
-			TIntObjectHashMap<L2Skill> skills = new TIntObjectHashMap<>();
-			List<L2MinionData> minions = new ArrayList<>();
-			List<ClassId> classIds = new ArrayList<>();
-			List<L2DropCategory> categories = new ArrayList<>();
-			
 			if (old != null)
 			{
-				skills.putAll(old.getSkills());
-				categories.addAll(old.getDropData());
-				classIds.addAll(old.getTeachInfo());
-				minions.addAll(old.getMinionData());
-				
-				if (!old.getEventQuests().isEmpty())
-				{
-					quests.putAll(old.getEventQuests());
-				}
+				quests = old.getEventQuests();
 			}
 			
 			loadNpcs(id);
@@ -182,31 +165,7 @@ public class NpcTable
 			
 			if ((old != null) && (created != null))
 			{
-				if (!skills.isEmpty())
-				{
-					for (L2Skill skill : skills.values(new L2Skill[0]))
-					{
-						created.addSkill(skill);
-					}
-				}
-				
-				for (ClassId classId : classIds)
-				{
-					created.addTeachInfo(classId);
-				}
-				
-				if (!minions.isEmpty())
-				{
-					for (L2MinionData minion : minions)
-					{
-						created.addRaidData(minion);
-					}
-				}
-				
-				if (!quests.isEmpty())
-				{
-					created.getEventQuests().putAll(quests);
-				}
+				created.getEventQuests().putAll(quests);
 			}
 		}
 		catch (Exception e)
@@ -312,7 +271,7 @@ public class NpcTable
 	 * @param sb the string builder with the parameters
 	 * @param table the table to update.
 	 * @param key the key of the table.
-	 * @param npcId the Npc Id. 
+	 * @param npcId the Npc Id.
 	 * @param con the current database connection.
 	 * @return the count of updated NPCs.
 	 * @throws SQLException the SQL exception.
@@ -367,9 +326,9 @@ public class NpcTable
 	 * @param lvls of all the templates to get.
 	 * @return the template list for the given level.
 	 */
-	public List<L2NpcTemplate> getAllOfLevel(int ...lvls)
+	public List<L2NpcTemplate> getAllOfLevel(int... lvls)
 	{
-		final List<L2NpcTemplate> list = new FastList<>();
+		final List<L2NpcTemplate> list = new ArrayList<>();
 		for (int lvl : lvls)
 		{
 			for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[0]))
@@ -387,9 +346,9 @@ public class NpcTable
 	 * @param lvls of all the monster templates to get.
 	 * @return the template list for the given level.
 	 */
-	public List<L2NpcTemplate> getAllMonstersOfLevel(int ...lvls)
+	public List<L2NpcTemplate> getAllMonstersOfLevel(int... lvls)
 	{
-		final List<L2NpcTemplate> list = new FastList<>();
+		final List<L2NpcTemplate> list = new ArrayList<>();
 		for (int lvl : lvls)
 		{
 			for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[0]))
@@ -407,9 +366,9 @@ public class NpcTable
 	 * @param letters of all the NPC templates which its name start with.
 	 * @return the template list for the given letter.
 	 */
-	public List<L2NpcTemplate> getAllNpcStartingWith(String ...letters)
+	public List<L2NpcTemplate> getAllNpcStartingWith(String... letters)
 	{
-		final List<L2NpcTemplate> list = new FastList<>();
+		final List<L2NpcTemplate> list = new ArrayList<>();
 		for (String letter : letters)
 		{
 			for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[0]))
@@ -427,9 +386,9 @@ public class NpcTable
 	 * @param classTypes of all the templates to get.
 	 * @return the template list for the given class type.
 	 */
-	public List<L2NpcTemplate> getAllNpcOfClassType(String ...classTypes)
+	public List<L2NpcTemplate> getAllNpcOfClassType(String... classTypes)
 	{
-		final List<L2NpcTemplate> list = new FastList<>();
+		final List<L2NpcTemplate> list = new ArrayList<>();
 		for (String classType : classTypes)
 		{
 			for (L2NpcTemplate t : _npcs.values(new L2NpcTemplate[0]))

L2J_Server_BETA/java/com/l2jserver/gameserver/scripting/scriptengine/impl/L2Script.java

@@ -17,8 +17,6 @@ package com.l2jserver.gameserver.scripting.scriptengine.impl;
 import java.util.ArrayList;
 import java.util.List;
 
-import javolution.util.FastList;
-
 import com.l2jserver.gameserver.model.L2Clan;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@@ -85,7 +83,7 @@ import com.l2jserver.gameserver.scripting.scriptengine.listeners.talk.ChatListen
  */
 public abstract class L2Script extends Quest
 {
-	private FastList<L2JListener> _listeners = new FastList<L2JListener>();
+	private List<L2JListener> _listeners = new ArrayList<L2JListener>();
 	
 	/**
 	 * constructor

L2J_Server_BETA/misc/log.cfg

@@ -10,25 +10,27 @@
 #handlers= java.util.logging.ConsoleHandler
 
 # To also add the FileHandler, use the following line instead.
-handlers = java.util.logging.FileHandler,java.util.logging.ConsoleHandler,\
-           com.l2jserver.log.ErrorLogHandler
-chat.handlers = com.l2jserver.log.ChatLogHandler
+handlers = java.util.logging.FileHandler,\
+		java.util.logging.ConsoleHandler,\
+		com.l2jserver.log.handler.ErrorLogHandler
+chat.handlers = com.l2jserver.log.handler.ChatLogHandler
 chat.useParentHandlers = false
-gmaudit.handlers = com.l2jserver.log.GMAuditLogHandler
+gmaudit.handlers = com.l2jserver.log.handler.GMAuditLogHandler
 gmaudit.useParentHandlers = false
-item.handlers = com.l2jserver.log.ItemLogHandler
+item.handlers = com.l2jserver.log.handler.ItemLogHandler
 item.useParentHandlers = false
-audit.handlers = com.l2jserver.log.AuditLogHandler
+audit.handlers = com.l2jserver.log.handler.AuditLogHandler
 audit.useParentHandlers = false
-enchant.handlers = com.l2jserver.log.EnchantItemLogHandler,\
-           com.l2jserver.log.EnchantSkillLogHandler
+enchant.handlers = com.l2jserver.log.handler.EnchantItemLogHandler,\
+		com.l2jserver.log.handler.EnchantSkillLogHandler
 enchant.useParentHandlers = false
-olympiad.handlers = com.l2jserver.log.OlympiadLogHandler
+olympiad.handlers = com.l2jserver.log.handler.OlympiadLogHandler
 olympiad.useParentHandlers = false
-damage.handlers = com.l2jserver.log.AllDamageLogHandler,\
-           com.l2jserver.log.PDamageLogHandler, com.l2jserver.log.MDamageLogHandler
+damage.handlers = com.l2jserver.log.handler.AllDamageLogHandler,\
+		com.l2jserver.log.handler.PDamageLogHandler,\
+		com.l2jserver.log.handler.MDamageLogHandler
 damage.useParentHandlers = false
-accounting.handlers = com.l2jserver.log.AccountingLogHandler
+accounting.handlers = com.l2jserver.log.handler.AccountingLogHandler
 accounting.useParentHandlers = false
 
 # Default global logging level.
@@ -48,92 +50,92 @@ accounting.useParentHandlers = false
 java.util.logging.FileHandler.pattern = log/java%g.log
 java.util.logging.FileHandler.count = 20
 java.util.logging.FileHandler.limit = 0
-java.util.logging.FileHandler.formatter = com.l2jserver.log.FileLogFormatter
+java.util.logging.FileHandler.formatter = com.l2jserver.log.formatter.FileLogFormatter
 java.util.logging.FileHandler.level = CONFIG
 
 # Limit the message that are printed on the console to INFO and above.
 java.util.logging.ConsoleHandler.level = FINER
-java.util.logging.ConsoleHandler.formatter = com.l2jserver.log.ConsoleLogFormatter
+java.util.logging.ConsoleHandler.formatter = com.l2jserver.log.formatter.ConsoleLogFormatter
 
 # log errors (exceptions)
-com.l2jserver.log.ErrorLogHandler.pattern = log/error%g.log
-com.l2jserver.log.ErrorLogHandler.count = 20
-com.l2jserver.log.ErrorLogHandler.limit = 0
-com.l2jserver.log.ErrorLogHandler.formatter = java.util.logging.SimpleFormatter
-com.l2jserver.log.ErrorLogHandler.filter = com.l2jserver.log.ErrorFilter
-com.l2jserver.log.ErrorLogHandler.level = CONFIG
+com.l2jserver.log.handler.ErrorLogHandler.pattern = log/error%g.log
+com.l2jserver.log.handler.ErrorLogHandler.count = 20
+com.l2jserver.log.handler.ErrorLogHandler.limit = 0
+com.l2jserver.log.handler.ErrorLogHandler.formatter = java.util.logging.SimpleFormatter
+com.l2jserver.log.handler.ErrorLogHandler.filter = com.l2jserver.log.filter.ErrorFilter
+com.l2jserver.log.handler.ErrorLogHandler.level = CONFIG
 
 # log chats
-com.l2jserver.log.ChatLogHandler.pattern = log/chat.log
-com.l2jserver.log.ChatLogHandler.formatter = com.l2jserver.log.ChatLogFormatter
-com.l2jserver.log.ChatLogHandler.filter = com.l2jserver.log.ChatFilter
-com.l2jserver.log.ChatLogHandler.append = true
-com.l2jserver.log.ChatLogHandler.level = INFO
+com.l2jserver.log.handler.ChatLogHandler.pattern = log/chat.log
+com.l2jserver.log.handler.ChatLogHandler.formatter = com.l2jserver.log.formatter.ChatLogFormatter
+com.l2jserver.log.handler.ChatLogHandler.filter = com.l2jserver.log.filter.ChatFilter
+com.l2jserver.log.handler.ChatLogHandler.append = true
+com.l2jserver.log.handler.ChatLogHandler.level = INFO
 
 # log GM Audit
-com.l2jserver.log.GMAuditLogHandler.pattern = log/gmaudit.log
-com.l2jserver.log.GMAuditLogHandler.formatter = com.l2jserver.log.GMAuditFormatter
-com.l2jserver.log.GMAuditLogHandler.filter = com.l2jserver.log.GMAuditFilter
-com.l2jserver.log.GMAuditLogHandler.append = true
-com.l2jserver.log.GMAuditLogHandler.level = INFO
+com.l2jserver.log.handler.GMAuditLogHandler.pattern = log/gmaudit.log
+com.l2jserver.log.handler.GMAuditLogHandler.formatter = com.l2jserver.log.formatter.GMAuditFormatter
+com.l2jserver.log.handler.GMAuditLogHandler.filter = com.l2jserver.log.filter.GMAuditFilter
+com.l2jserver.log.handler.GMAuditLogHandler.append = true
+com.l2jserver.log.handler.GMAuditLogHandler.level = INFO
 
 # log items
-com.l2jserver.log.ItemLogHandler.pattern = log/item.log
-com.l2jserver.log.ItemLogHandler.formatter = com.l2jserver.log.ItemLogFormatter
-com.l2jserver.log.ItemLogHandler.filter = com.l2jserver.log.ItemFilter
-com.l2jserver.log.ItemLogHandler.append = true
-com.l2jserver.log.ItemLogHandler.level = INFO
+com.l2jserver.log.handler.ItemLogHandler.pattern = log/item.log
+com.l2jserver.log.handler.ItemLogHandler.formatter = com.l2jserver.log.formatter.ItemLogFormatter
+com.l2jserver.log.handler.ItemLogHandler.filter = com.l2jserver.log.filter.ItemFilter
+com.l2jserver.log.handler.ItemLogHandler.append = true
+com.l2jserver.log.handler.ItemLogHandler.level = INFO
 
 # audit
-com.l2jserver.log.AuditLogHandler.pattern = log/audit.log
-com.l2jserver.log.AuditLogHandler.formatter = com.l2jserver.log.AuditFormatter
-com.l2jserver.log.AuditLogHandler.filter = com.l2jserver.log.AuditFilter
-com.l2jserver.log.AuditLogHandler.append = true
-com.l2jserver.log.AuditLogHandler.level = INFO
+com.l2jserver.log.handler.AuditLogHandler.pattern = log/audit.log
+com.l2jserver.log.handler.AuditLogHandler.formatter = com.l2jserver.log.formatter.AuditFormatter
+com.l2jserver.log.handler.AuditLogHandler.filter = com.l2jserver.log.filter.AuditFilter
+com.l2jserver.log.handler.AuditLogHandler.append = true
+com.l2jserver.log.handler.AuditLogHandler.level = INFO
 
 # enchant item log
-com.l2jserver.log.EnchantItemLogHandler.pattern = log/enchantitem.log
-com.l2jserver.log.EnchantItemLogHandler.formatter = com.l2jserver.log.EnchantFormatter
-com.l2jserver.log.EnchantItemLogHandler.filter = com.l2jserver.log.EnchantItemFilter
-com.l2jserver.log.EnchantItemLogHandler.append = true
-com.l2jserver.log.EnchantItemLogHandler.level = INFO
+com.l2jserver.log.handler.EnchantItemLogHandler.pattern = log/enchantitem.log
+com.l2jserver.log.handler.EnchantItemLogHandler.formatter = com.l2jserver.log.formatter.EnchantFormatter
+com.l2jserver.log.handler.EnchantItemLogHandler.filter = com.l2jserver.log.filter.EnchantItemFilter
+com.l2jserver.log.handler.EnchantItemLogHandler.append = true
+com.l2jserver.log.handler.EnchantItemLogHandler.level = INFO
 
 # enchant skill log
-com.l2jserver.log.EnchantSkillLogHandler.pattern = log/enchantskill.log
-com.l2jserver.log.EnchantSkillLogHandler.formatter = com.l2jserver.log.EnchantFormatter
-com.l2jserver.log.EnchantSkillLogHandler.filter = com.l2jserver.log.EnchantSkillFilter
-com.l2jserver.log.EnchantSkillLogHandler.append = true
-com.l2jserver.log.EnchantSkillLogHandler.level = INFO
+com.l2jserver.log.handler.EnchantSkillLogHandler.pattern = log/enchantskill.log
+com.l2jserver.log.handler.EnchantSkillLogHandler.formatter = com.l2jserver.log.formatter.EnchantFormatter
+com.l2jserver.log.handler.EnchantSkillLogHandler.filter = com.l2jserver.log.filter.EnchantSkillFilter
+com.l2jserver.log.handler.EnchantSkillLogHandler.append = true
+com.l2jserver.log.handler.EnchantSkillLogHandler.level = INFO
 
 # olympiad log
-com.l2jserver.log.OlympiadLogHandler.pattern = log/olympiad.csv
-com.l2jserver.log.OlympiadLogHandler.formatter = com.l2jserver.log.OlympiadFormatter
-com.l2jserver.log.OlympiadLogHandler.append = true
-com.l2jserver.log.OlympiadLogHandler.level = INFO
+com.l2jserver.log.handler.OlympiadLogHandler.pattern = log/olympiad.csv
+com.l2jserver.log.handler.OlympiadLogHandler.formatter = com.l2jserver.log.formatter.OlympiadFormatter
+com.l2jserver.log.handler.OlympiadLogHandler.append = true
+com.l2jserver.log.handler.OlympiadLogHandler.level = INFO
 
 # damage logs
-com.l2jserver.log.AllDamageLogHandler.pattern = log/game/_all.txt
-com.l2jserver.log.AllDamageLogHandler.formatter = com.l2jserver.log.DamageFormatter
-com.l2jserver.log.AllDamageLogHandler.append = true
-com.l2jserver.log.AllDamageLogHandler.level = INFO
-
-com.l2jserver.log.PDamageLogHandler.pattern = log/game/damage_pdam.txt
-com.l2jserver.log.PDamageLogHandler.formatter = com.l2jserver.log.DamageFormatter
-com.l2jserver.log.PDamageLogHandler.filter = com.l2jserver.log.PDamageFilter
-com.l2jserver.log.PDamageLogHandler.append = true
-com.l2jserver.log.PDamageLogHandler.level = INFO
-
-com.l2jserver.log.MDamageLogHandler.pattern = log/game/damage_mdam.txt
-com.l2jserver.log.MDamageLogHandler.formatter = com.l2jserver.log.DamageFormatter
-com.l2jserver.log.MDamageLogHandler.filter = com.l2jserver.log.MDamageFilter
-com.l2jserver.log.MDamageLogHandler.append = true
-com.l2jserver.log.MDamageLogHandler.level = INFO
+com.l2jserver.log.handler.AllDamageLogHandler.pattern = log/game/_all.txt
+com.l2jserver.log.handler.AllDamageLogHandler.formatter = com.l2jserver.log.formatter.DamageFormatter
+com.l2jserver.log.handler.AllDamageLogHandler.append = true
+com.l2jserver.log.handler.AllDamageLogHandler.level = INFO
+
+com.l2jserver.log.handler.PDamageLogHandler.pattern = log/game/damage_pdam.txt
+com.l2jserver.log.handler.PDamageLogHandler.formatter = com.l2jserver.log.formatter.DamageFormatter
+com.l2jserver.log.handler.PDamageLogHandler.filter = com.l2jserver.log.filter.PDamageFilter
+com.l2jserver.log.handler.PDamageLogHandler.append = true
+com.l2jserver.log.handler.PDamageLogHandler.level = INFO
+
+com.l2jserver.log.handler.MDamageLogHandler.pattern = log/game/damage_mdam.txt
+com.l2jserver.log.handler.MDamageLogHandler.formatter = com.l2jserver.log.formatter.DamageFormatter
+com.l2jserver.log.handler.MDamageLogHandler.filter = com.l2jserver.log.filter.MDamageFilter
+com.l2jserver.log.handler.MDamageLogHandler.append = true
+com.l2jserver.log.handler.MDamageLogHandler.level = INFO
 
 # accounting
-com.l2jserver.log.AccountingLogHandler.pattern = log/accounting.log
-com.l2jserver.log.AccountingLogHandler.formatter = com.l2jserver.log.AccountingFormatter
-com.l2jserver.log.AccountingLogHandler.append = true
-com.l2jserver.log.AccountingLogHandler.level = CONFIG
+com.l2jserver.log.handler.AccountingLogHandler.pattern = log/accounting.log
+com.l2jserver.log.handler.AccountingLogHandler.formatter = com.l2jserver.log.filter.AccountingFormatter
+com.l2jserver.log.handler.AccountingLogHandler.append = true
+com.l2jserver.log.handler.AccountingLogHandler.level = CONFIG
 
 ############################################################
 # Facility specific properties.
@@ -152,6 +154,6 @@ com.l2jserver.gameserver.engines.DocumentEngine.level = INFO
 
 # Alt Privileges Administration
 AltPrivilegesAdmin.pattern = log/admin-commands.log
-AltPrivilegesAdmin.formatter = com.l2jserver.log.FileLogFormatter
+AltPrivilegesAdmin.formatter = com.l2jserver.log.formatter.FileLogFormatter
 AltPrivilegesAdmin.append = true
 AltPrivilegesAdmin.level = CONFIG