IdFactory update. Thx Gnacik.

NpcAiData cleanup unused.
New eclipse compiler lib.

L2_GameServer/java/com/l2jserver/gameserver/idfactory/IdFactory.java

@@ -166,6 +166,7 @@ public abstract class IdFactory
 		Statement stmt = null;
 		try
 		{
+			long cleanupStart = System.currentTimeMillis();
 			int cleanCount = 0;
 			con = L2DatabaseFactory.getInstance().getConnection();
 			stmt = con.createStatement();
@@ -226,7 +227,9 @@ public abstract class IdFactory
 			cleanCount += stmt.executeUpdate("DELETE FROM heroes_diary WHERE heroes_diary.charId NOT IN (SELECT charId FROM characters);");
 			cleanCount += stmt.executeUpdate("DELETE FROM character_offline_trade WHERE character_offline_trade.charId NOT IN (SELECT charId FROM characters);");
 			cleanCount += stmt.executeUpdate("DELETE FROM character_offline_trade_items WHERE character_offline_trade_items.charId NOT IN (SELECT charId FROM characters);");
-			
+			cleanCount += stmt.executeUpdate("DELETE FROM character_quest_global_data WHERE character_quest_global_data.charId NOT IN (SELECT charId FROM characters);");
+			cleanCount += stmt.executeUpdate("DELETE FROM character_tpbookmark WHERE character_tpbookmark.charId NOT IN (SELECT charId FROM characters);");
+
 			// If the clan does not exist...
 			cleanCount += stmt.executeUpdate("DELETE FROM clan_privs WHERE clan_privs.clan_id NOT IN (SELECT clan_id FROM clan_data);");
 			cleanCount += stmt.executeUpdate("DELETE FROM clan_skills WHERE clan_skills.clan_id NOT IN (SELECT clan_id FROM clan_data);");
@@ -247,6 +250,7 @@ public abstract class IdFactory
 			
 			// Forum Related
 			cleanCount += stmt.executeUpdate("DELETE FROM forums WHERE forums.forum_owner_id NOT IN (SELECT clan_id FROM clan_data) AND forums.forum_parent=2;");
+			cleanCount += stmt.executeUpdate("DELETE FROM forums WHERE forums.forum_owner_id NOT IN (SELECT charId FROM characters) AND forums.forum_parent=3;");
 			cleanCount += stmt.executeUpdate("DELETE FROM posts WHERE posts.post_forum_id NOT IN (SELECT forum_id FROM forums);");
 			cleanCount += stmt.executeUpdate("DELETE FROM topic WHERE topic.topic_forum_id NOT IN (SELECT forum_id FROM forums);");
 			
@@ -258,7 +262,7 @@ public abstract class IdFactory
 			stmt.executeUpdate("UPDATE clanhall SET ownerId=0, paidUntil=0, paid=0 WHERE clanhall.ownerId NOT IN (SELECT clan_id FROM clan_data);");
 			stmt.executeUpdate("UPDATE fort SET owner=0 WHERE owner NOT IN (SELECT clan_id FROM clan_data);");
 			
-			_log.info("Cleaned " + cleanCount + " elements from database.");
+			_log.info("Cleaned " + cleanCount + " elements from database in "+((System.currentTimeMillis()-cleanupStart)/1000)+" s");
 			stmt.close();
 		}
 		catch (SQLException e)

L2_GameServer/java/com/l2jserver/gameserver/model/L2NpcAIData.java

@@ -20,12 +20,7 @@ package com.l2jserver.gameserver.model;
 
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType;
 
-import javolution.util.FastList;
-
 /**
- *
- * 
- * 
  * Author: ShanSoft
  * By L2JTW
  * 
@@ -60,25 +55,6 @@ public class L2NpcAIData
 	private int _switchrangechance;
 	private AIType _aiType = AIType.FIGHTER;
 	
-	//Skill AI
-	public FastList<L2Skill> _buffskills;
-	public FastList<L2Skill> _negativeskills;
-	public FastList<L2Skill> _debuffskills;
-	public FastList<L2Skill> _atkskills;
-	public FastList<L2Skill> _rootskills;
-	public FastList<L2Skill> _stunskills;
-	public FastList<L2Skill> _sleepskills;
-	public FastList<L2Skill> _paralyzeskills;
-	public FastList<L2Skill> _fossilskills;
-	public FastList<L2Skill> _floatskills;
-	public FastList<L2Skill> _immobiliseskills;
-	public FastList<L2Skill> _healskills;
-	public FastList<L2Skill> _resskills;
-	public FastList<L2Skill> _dotskills;
-	public FastList<L2Skill> _cotskills;
-	public FastList<L2Skill> _universalskills;
-	public FastList<L2Skill> _manaskills;
-	
 	//--------------------------------------------------------------------------------------------------------------
 	//Setting....
 	//--------------------------------------------------------------------------------------------------------------
@@ -382,261 +358,4 @@ public class L2NpcAIData
 		
 	}
 	*/
-
-	public void addBuffSkill(L2Skill skill)
-	{
-		if (_buffskills == null)
-			_buffskills = new FastList<L2Skill>();
-		_buffskills.add(skill);
-	}
-	
-	public void addHealSkill(L2Skill skill)
-	{
-		if (_healskills == null)
-			_healskills = new FastList<L2Skill>();
-		_healskills.add(skill);
-	}
-	
-	public void addResSkill(L2Skill skill)
-	{
-		if (_resskills == null)
-			_resskills = new FastList<L2Skill>();
-		_resskills.add(skill);
-	}
-	
-	public void addAtkSkill(L2Skill skill)
-	{
-		if (_atkskills == null)
-			_atkskills = new FastList<L2Skill>();
-		_atkskills.add(skill);
-	}
-	
-	public void addDebuffSkill(L2Skill skill)
-	{
-		if (_debuffskills == null)
-			_debuffskills = new FastList<L2Skill>();
-		_debuffskills.add(skill);
-	}
-	
-	public void addRootSkill(L2Skill skill)
-	{
-		if (_rootskills == null)
-			_rootskills = new FastList<L2Skill>();
-		_rootskills.add(skill);
-	}
-	
-	public void addSleepSkill(L2Skill skill)
-	{
-		if (_sleepskills == null)
-			_sleepskills = new FastList<L2Skill>();
-		_sleepskills.add(skill);
-	}
-	
-	public void addStunSkill(L2Skill skill)
-	{
-		if (_stunskills == null)
-			_stunskills = new FastList<L2Skill>();
-		_stunskills.add(skill);
-	}
-	
-	public void addParalyzeSkill(L2Skill skill)
-	{
-		if (_paralyzeskills == null)
-			_paralyzeskills = new FastList<L2Skill>();
-		_paralyzeskills.add(skill);
-	}
-	
-	public void addFloatSkill(L2Skill skill)
-	{
-		if (_floatskills == null)
-			_floatskills = new FastList<L2Skill>();
-		_floatskills.add(skill);
-	}
-	
-	public void addFossilSkill(L2Skill skill)
-	{
-		if (_fossilskills == null)
-			_fossilskills = new FastList<L2Skill>();
-		_fossilskills.add(skill);
-	}
-	
-	public void addNegativeSkill(L2Skill skill)
-	{
-		if (_negativeskills == null)
-			_negativeskills = new FastList<L2Skill>();
-		_negativeskills.add(skill);
-	}
-	
-	public void addImmobiliseSkill(L2Skill skill)
-	{
-		if (_immobiliseskills == null)
-			_immobiliseskills = new FastList<L2Skill>();
-		_immobiliseskills.add(skill);
-	}
-	
-	public void addDOTSkill(L2Skill skill)
-	{
-		if (_dotskills == null)
-			_dotskills = new FastList<L2Skill>();
-		_dotskills.add(skill);
-	}
-	
-	public void addUniversalSkill(L2Skill skill)
-	{
-		if (_universalskills == null)
-			_universalskills = new FastList<L2Skill>();
-		_universalskills.add(skill);
-	}
-	
-	public void addCOTSkill(L2Skill skill)
-	{
-		if (_cotskills == null)
-			_cotskills = new FastList<L2Skill>();
-		_cotskills.add(skill);
-	}
-	
-	public void addManaHealSkill(L2Skill skill)
-	{
-		if (_manaskills == null)
-			_manaskills = new FastList<L2Skill>();
-		_manaskills.add(skill);
-	}
-	
-	//--------------------------------------------------------------------
-	public boolean hasBuffSkill()
-	{
-		if (_buffskills != null && _buffskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasHealSkill()
-	{
-		if (_healskills != null && _healskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasResSkill()
-	{
-		if (_resskills != null && _resskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasAtkSkill()
-	{
-		if (_atkskills != null && _atkskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasDebuffSkill()
-	{
-		if (_debuffskills != null && _debuffskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasRootSkill()
-	{
-		if (_rootskills != null && _rootskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasSleepSkill()
-	{
-		if (_sleepskills != null && _sleepskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasStunSkill()
-	{
-		if (_stunskills != null && _stunskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasParalyzeSkill()
-	{
-		if (_paralyzeskills != null && _paralyzeskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasFloatSkill()
-	{
-		if (_floatskills != null && _floatskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasFossilSkill()
-	{
-		if (_fossilskills != null && _fossilskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasNegativeSkill()
-	{
-		if (_negativeskills != null && _negativeskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasImmobiliseSkill()
-	{
-		if (_immobiliseskills != null && _immobiliseskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasDOTSkill()
-	{
-		if (_dotskills != null && _dotskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasUniversalSkill()
-	{
-		if (_universalskills != null && _universalskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasCOTSkill()
-	{
-		if (_cotskills != null && _cotskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean hasManaHealSkill()
-	{
-		if (_manaskills != null && _manaskills.size() > 0)
-			return true;
-		else
-			return false;
-	}
-	
 }

L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -2613,7 +2613,7 @@ public abstract class L2Character extends L2Object
 			}
 			catch (Exception e)
 			{
-				_log.log(Level.WARNING, "NotifyAITask failed. " + e.getMessage(), e);
+				_log.log(Level.WARNING, "NotifyAITask failed. " + e.getMessage() + " Actor "+L2Character.this, e);
 			}
 		}
 	}