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

6
trunk/java/com/l2jserver/gameserver/network/clientpackets/MultiSellChoose.java
View File

@ -20,8 +20,6 @@ package com.l2jserver.gameserver.network.clientpackets;
import java.util.ArrayList;
import javolution.util.FastList;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.xml.impl.MultisellData;
import com.l2jserver.gameserver.model.Elementals;
@ -216,7 +214,7 @@ public class MultiSellChoose extends L2GameClientPacket
}
}
FastList<L2Augmentation> augmentation = FastList.newInstance();
ArrayList<L2Augmentation> augmentation = new ArrayList<>();
Elementals[] elemental = null;
/** All ok, remove items and add final product */
@ -455,7 +453,7 @@ public class MultiSellChoose extends L2GameClientPacket
}
finally
{
FastList.recycle(augmentation);
augmentation.clear(); // ?
}
// finally, give the tax to the castle...

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponList.java
View File

@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.network.serverpackets.ExCursedWeaponList;
@ -50,7 +49,7 @@ public class RequestCursedWeaponList extends L2GameClientPacket
}
// send a ExCursedWeaponList :p
List<Integer> list = new FastList<>();
List<Integer> list = new ArrayList<>();
for (int id : CursedWeaponsManager.getInstance().getCursedWeaponsIds())
{
list.add(id);

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestCursedWeaponLocation.java
View File

@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
import com.l2jserver.gameserver.instancemanager.CursedWeaponsManager;
import com.l2jserver.gameserver.model.CursedWeapon;
import com.l2jserver.gameserver.model.Location;
@ -52,7 +51,7 @@ public final class RequestCursedWeaponLocation extends L2GameClientPacket
return;
}
List<CursedWeaponInfo> list = new FastList<>();
List<CursedWeaponInfo> list = new ArrayList<>();
for (CursedWeapon cw : CursedWeaponsManager.getInstance().getCursedWeapons())
{
if (!cw.isActive())

5
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPreviewItem.java
View File

@ -18,11 +18,10 @@
*/
package com.l2jserver.gameserver.network.clientpackets;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.gameserver.ThreadPoolManager;
import com.l2jserver.gameserver.data.xml.impl.BuyListData;
@ -166,7 +165,7 @@ public final class RequestPreviewItem extends L2GameClientPacket
}
long totalPrice = 0;
Map<Integer, Integer> itemList = new FastMap<>();
Map<Integer, Integer> itemList = new HashMap<>();
for (int i = 0; i < _count; i++)
{

7
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPrivateStoreBuy.java
View File

@ -19,7 +19,8 @@
package com.l2jserver.gameserver.network.clientpackets;
import static com.l2jserver.gameserver.model.actor.L2Npc.INTERACTION_DISTANCE;
import javolution.util.FastSet;
import java.util.HashSet;
import com.l2jserver.Config;
import com.l2jserver.gameserver.data.sql.impl.OfflineTradersTable;
@ -43,7 +44,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket
private static final int BATCH_LENGTH = 20; // length of the one item
private int _storePlayerId;
private FastSet<ItemRequest> _items = null;
private HashSet<ItemRequest> _items = null;
@Override
protected void readImpl()
@ -54,7 +55,7 @@ public final class RequestPrivateStoreBuy extends L2GameClientPacket
{
return;
}
_items = new FastSet<>();
_items = new HashSet<>();
for (int i = 0; i < count; i++)
{

5
trunk/java/com/l2jserver/gameserver/network/serverpackets/CharSelectionInfo.java
View File

@ -21,12 +21,11 @@ package com.l2jserver.gameserver.network.serverpackets;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
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.data.sql.impl.ClanTable;
@ -201,7 +200,7 @@ public class CharSelectionInfo extends L2GameServerPacket
private static CharSelectInfoPackage[] loadCharacterSelectInfo(String loginName)
{
CharSelectInfoPackage charInfopackage;
List<CharSelectInfoPackage> characterList = new FastList<>();
List<CharSelectInfoPackage> characterList = new ArrayList<>();
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement statement = con.prepareStatement("SELECT * FROM characters WHERE account_name=? ORDER BY createDate"))

6
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillInfo.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import javolution.util.FastList;
import java.util.ArrayList;
import com.l2jserver.gameserver.data.xml.impl.EnchantSkillGroupsData;
import com.l2jserver.gameserver.model.L2EnchantSkillGroup.EnchantSkillHolder;
@ -26,7 +26,7 @@ import com.l2jserver.gameserver.model.L2EnchantSkillLearn;
public final class ExEnchantSkillInfo extends L2GameServerPacket
{
private final FastList<Integer> _routes; // skill lvls for each route
private final ArrayList<Integer> _routes; // skill lvls for each route
private final int _id;
private final int _lvl;
@ -34,7 +34,7 @@ public final class ExEnchantSkillInfo extends L2GameServerPacket
public ExEnchantSkillInfo(int id, int lvl)
{
_routes = new FastList<>();
_routes = new ArrayList<>();
_id = id;
_lvl = lvl;

5
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExEnchantSkillList.java
View File

@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
public class ExEnchantSkillList extends L2GameServerPacket
{
public enum EnchantSkillType
@ -55,7 +54,7 @@ public class ExEnchantSkillList extends L2GameServerPacket
public ExEnchantSkillList(EnchantSkillType type)
{
_type = type;
_skills = new FastList<>();
_skills = new ArrayList<>();
}
@Override

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressMapInfo.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import javolution.util.FastList;
import java.util.ArrayList;
import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
import com.l2jserver.gameserver.model.FortSiegeSpawn;
@ -47,7 +47,7 @@ public class ExShowFortressMapInfo extends L2GameServerPacket
writeD(_fortress.getSiege().isInProgress() ? 1 : 0); // fortress siege status
writeD(_fortress.getFortSize()); // barracks count
FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
ArrayList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortress.getResidenceId());
if ((commanders != null) && (commanders.size() != 0) && _fortress.getSiege().isInProgress())
{
switch (commanders.size())

4
trunk/java/com/l2jserver/gameserver/network/serverpackets/ExShowFortressSiegeInfo.java
View File

@ -18,7 +18,7 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import javolution.util.FastList;
import java.util.ArrayList;
import com.l2jserver.gameserver.instancemanager.FortSiegeManager;
import com.l2jserver.gameserver.model.FortSiegeSpawn;
@ -41,7 +41,7 @@ public class ExShowFortressSiegeInfo extends L2GameServerPacket
{
_fortId = fort.getResidenceId();
_size = fort.getFortSize();
FastList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId);
ArrayList<FortSiegeSpawn> commanders = FortSiegeManager.getInstance().getCommanderSpawnList(_fortId);
_csize = ((commanders == null) ? 0 : commanders.size());
_csize2 = fort.getSiege().getCommanders().size();
}

7
trunk/java/com/l2jserver/gameserver/network/serverpackets/RelationChanged.java
View File

@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
import com.l2jserver.gameserver.model.actor.L2Playable;
/**
@ -78,7 +77,7 @@ public final class RelationChanged extends L2GameServerPacket
{
_mask |= SEND_MULTI;
_multi = FastList.newInstance();
_multi = new ArrayList<>();
}
public void addRelation(L2Playable activeChar, int relation, boolean autoattackable)
@ -113,7 +112,7 @@ public final class RelationChanged extends L2GameServerPacket
{
writeRelation(r);
}
FastList.recycle((FastList<?>) _multi);
// _multi.clear();
}
}

5
trunk/java/com/l2jserver/gameserver/network/serverpackets/SellList.java
View File

@ -18,10 +18,9 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.List;
import javolution.util.FastList;
import com.l2jserver.gameserver.model.actor.L2Summon;
import com.l2jserver.gameserver.model.actor.instance.L2MerchantInstance;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -36,7 +35,7 @@ public class SellList extends L2GameServerPacket
private final L2PcInstance _activeChar;
private final L2MerchantInstance _lease;
private final long _money;
private final List<L2ItemInstance> _selllist = new FastList<>();
private final List<L2ItemInstance> _selllist = new ArrayList<>();
public SellList(L2PcInstance player)
{

31
trunk/java/com/l2jserver/gameserver/network/serverpackets/SortedWareHouseWithdrawalList.java
View File

@ -18,12 +18,11 @@
*/
package com.l2jserver.gameserver.network.serverpackets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import javolution.util.FastList;
import com.l2jserver.gameserver.data.xml.impl.RecipeData;
import com.l2jserver.gameserver.model.L2RecipeList;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
@ -42,7 +41,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
public static final int FREIGHT = 4; // not sure
private long _playerAdena;
private List<L2WarehouseItem> _objects = new FastList<>();
private List<L2WarehouseItem> _objects = new ArrayList<>();
private int _whType;
public static enum WarehouseListType
@ -419,7 +418,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createWeaponList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item.isWeapon() || (item.getItem().getType2() == L2Item.TYPE2_WEAPON) || (item.isEtcItem() && (item.getItemType() == EtcItemType.ARROW)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -444,7 +443,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createArmorList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item.isArmor() || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -469,7 +468,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createEtcItemList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item.isEtcItem() || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -494,7 +493,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createMatList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.MATERIAL)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -519,7 +518,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createRecipeList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.RECIPE)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -544,7 +543,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createAmulettList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -569,7 +568,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createSpellbookList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (!item.getItemName().toUpperCase().startsWith("AMULET"))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -594,7 +593,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createConsumableList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && ((item.getEtcItem().getItemType() == EtcItemType.SCROLL) || (item.getEtcItem().getItemType() == EtcItemType.SHOT))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -619,7 +618,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createShotList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SHOT)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -644,7 +643,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createScrollList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SCROLL)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -669,7 +668,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createSeedList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && (item.getEtcItem().getItemType() == EtcItemType.SEED)) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -694,7 +693,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createOtherList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item.isEtcItem() && ((item.getEtcItem().getItemType() != EtcItemType.MATERIAL) && (item.getEtcItem().getItemType() != EtcItemType.RECIPE) && (item.getEtcItem().getItemType() != EtcItemType.SCROLL) && (item.getEtcItem().getItemType() != EtcItemType.SHOT))) || (item.getItem().getType2() == L2Item.TYPE2_MONEY))
@ -719,7 +718,7 @@ public class SortedWareHouseWithdrawalList extends AbstractItemPacket
*/
private List<L2WarehouseItem> createAllList(L2ItemInstance[] _items)
{
List<L2WarehouseItem> _list = new FastList<>();
List<L2WarehouseItem> _list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (_list.size() < MAX_SORT_LIST_ITEMS)