Browse Source

BETA: Replacing FastList with ArrayList in L2Skill for non-shared maps.
* Thanks Tryskell to bring this to my attention.
* JavaDocs for L2ExtractableSkill.

Zoey76 13 years ago
parent
commit
19e406b4d7

+ 18 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2ExtractableSkill.java

@@ -14,28 +14,42 @@
  */
  */
 package com.l2jserver.gameserver.model;
 package com.l2jserver.gameserver.model;
 
 
-import javolution.util.FastList;
+import java.util.List;
 
 
 /**
 /**
+ * Extractable skill DTO.
  * @author Zoey76
  * @author Zoey76
  */
  */
 public class L2ExtractableSkill
 public class L2ExtractableSkill
 {
 {
 	private final int _hash;
 	private final int _hash;
-	private final FastList<L2ExtractableProductItem> _product;
+	private final List<L2ExtractableProductItem> _product;
 	
 	
-	public L2ExtractableSkill(int hash, FastList<L2ExtractableProductItem> products)
+	/**
+	 * Instantiates a new extractable skill.
+	 * @param hash the hash
+	 * @param products the products
+	 */
+	public L2ExtractableSkill(int hash, List<L2ExtractableProductItem> products)
 	{
 	{
 		_hash = hash;
 		_hash = hash;
 		_product = products;
 		_product = products;
 	}
 	}
 	
 	
+	/**
+	 * Gets the skill hash.
+	 * @return the skill hash
+	 */
 	public int getSkillHash()
 	public int getSkillHash()
 	{
 	{
 		return _hash;
 		return _hash;
 	}
 	}
 	
 	
-	public FastList<L2ExtractableProductItem> getProductItems()
+	/**
+	 * Gets the product items.
+	 * @return the product items
+	 */
+	public List<L2ExtractableProductItem> getProductItems()
 	{
 	{
 		return _product;
 		return _product;
 	}
 	}

+ 3 - 4
L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/L2Skill.java

@@ -21,7 +21,6 @@ import java.util.StringTokenizer;
 import java.util.logging.Level;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
-import javolution.util.FastList;
 import javolution.util.FastMap;
 import javolution.util.FastMap;
 
 
 import com.l2jserver.Config;
 import com.l2jserver.Config;
@@ -1874,13 +1873,13 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		if (itemOrWeapon)
 		if (itemOrWeapon)
 		{
 		{
 			if (_itemPreCondition == null)
 			if (_itemPreCondition == null)
-				_itemPreCondition = new FastList<>();
+				_itemPreCondition = new ArrayList<>();
 			_itemPreCondition.add(c);
 			_itemPreCondition.add(c);
 		}
 		}
 		else
 		else
 		{
 		{
 			if (_preCondition == null)
 			if (_preCondition == null)
-				_preCondition = new FastList<>();
+				_preCondition = new ArrayList<>();
 			_preCondition.add(c);
 			_preCondition.add(c);
 		}
 		}
 	}
 	}
@@ -2010,7 +2009,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	private L2ExtractableSkill parseExtractableSkill(int skillId, int skillLvl, String values)
 	private L2ExtractableSkill parseExtractableSkill(int skillId, int skillLvl, String values)
 	{
 	{
 		final String[] prodLists = values.split(";");
 		final String[] prodLists = values.split(";");
-		final FastList<L2ExtractableProductItem> products = new FastList<>();
+		final List<L2ExtractableProductItem> products = new ArrayList<>();
 		String[] prodData;
 		String[] prodData;
 		for (String prodList : prodLists)
 		for (String prodList : prodLists)
 		{
 		{