lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Dropped Javolution.

Browse Source 
-Removal of Q00344_1000YearsTheEndOfLamentation.
-Fixed starting conditions for Q00144_PailakaInjuredDragon.
-Fixed starting conditions for last Seven Sign quests.
-Added missing MonasteryOfSilence.xml instance spawns and doors.
-Removed many catacomb spawns.
This commit is contained in:
mobius
2015-02-08 21:01:32 +00:00
parent 141cdc5efa
commit 012eb3ed65
201 changed files with 817 additions and 1458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
trunk/java/com/l2jserver/gameserver/engines/DocumentBase.java
View File

@ -20,6 +20,7 @@ package com.l2jserver.gameserver.engines;
import java.io.File;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@ -30,8 +31,6 @@ import java.util.logging.Logger;
import javax.xml.parsers.DocumentBuilderFactory;
import javolution.util.FastMap;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@ -154,7 +153,7 @@ public abstract class DocumentBase
protected DocumentBase(File pFile)
{
_file = pFile;
_tables = new FastMap<>();
_tables = new HashMap<>();
}
public Document parse()
@ -185,7 +184,7 @@ public abstract class DocumentBase
protected void resetTable()
{
_tables = new FastMap<>();
_tables = new HashMap<>();
}
protected void setTable(String name, String[] table)

9
trunk/java/com/l2jserver/gameserver/engines/DocumentEngine.java
View File

@ -19,12 +19,11 @@
package com.l2jserver.gameserver.engines;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.datatables.SkillData;
import com.l2jserver.gameserver.engines.items.DocumentItem;
@ -40,8 +39,8 @@ public class DocumentEngine
{
private static final Logger _log = Logger.getLogger(DocumentEngine.class.getName());
private final List<File> _itemFiles = new FastList<>();
private final List<File> _skillFiles = new FastList<>();
private final List<File> _itemFiles = new ArrayList<>();
private final List<File> _skillFiles = new ArrayList<>();
public static DocumentEngine getInstance()
{
@ -114,7 +113,7 @@ public class DocumentEngine
*/
public List<L2Item> loadItems()
{
List<L2Item> list = new FastList<>();
List<L2Item> list = new ArrayList<>();
for (File f : _itemFiles)
{
DocumentItem document = new DocumentItem(f);

5
trunk/java/com/l2jserver/gameserver/engines/items/DocumentItem.java
View File

@ -21,11 +21,10 @@ package com.l2jserver.gameserver.engines.items;
import java.io.File;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import javolution.util.FastList;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
@ -40,7 +39,7 @@ import com.l2jserver.gameserver.model.items.L2Item;
public final class DocumentItem extends DocumentBase
{
private Item _currentItem = null;
private final List<L2Item> _itemsInFile = new FastList<>();
private final List<L2Item> _itemsInFile = new ArrayList<>();
/**
* @param file

11
trunk/java/com/l2jserver/gameserver/engines/skills/DocumentSkill.java
View File

@ -19,11 +19,10 @@
package com.l2jserver.gameserver.engines.skills;
import java.io.File;
import java.util.ArrayList;
import java.util.List;
import java.util.logging.Level;
import javolution.util.FastList;
import org.w3c.dom.Document;
import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
@ -54,12 +53,12 @@ public class DocumentSkill extends DocumentBase
public StatsSet[] enchsets7;
public StatsSet[] enchsets8;
public int currentLevel;
public List<Skill> skills = new FastList<>();
public List<Skill> currentSkills = new FastList<>();
public List<Skill> skills = new ArrayList<>();
public List<Skill> currentSkills = new ArrayList<>();
}
private SkillInfo _currentSkill;
private final List<Skill> _skillsInFile = new FastList<>();
private final List<Skill> _skillsInFile = new ArrayList<>();
public DocumentSkill(File file)
{
@ -1491,7 +1490,7 @@ public class DocumentSkill extends DocumentBase
private void makeSkills()
{
int count = 0;
_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);
_currentSkill.currentSkills = new ArrayList<>(_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);
StatsSet set;
for (int i = 0; i < _currentSkill.sets.length; i++)
{