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

4
trunk/java/com/l2jserver/gameserver/model/itemcontainer/Inventory.java
View File

@ -26,8 +26,6 @@ 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.xml.impl.ArmorSetsData;
@ -130,7 +128,7 @@ public abstract class Inventory extends ItemContainer
ChangeRecorder(Inventory inventory)
{
_inventory = inventory;
_changed = new FastList<>();
_changed = new ArrayList<>();
_inventory.addPaperdollListener(this);
}

5
trunk/java/com/l2jserver/gameserver/model/itemcontainer/ItemContainer.java
View File

@ -23,11 +23,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CopyOnWriteArrayList;
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.GameTimeController;
@ -46,7 +45,7 @@ public abstract class ItemContainer
{
protected static final Logger _log = Logger.getLogger(ItemContainer.class.getName());
protected final List<L2ItemInstance> _items = new FastList<L2ItemInstance>().shared();
protected final List<L2ItemInstance> _items = new CopyOnWriteArrayList<>();
protected ItemContainer()
{

27
trunk/java/com/l2jserver/gameserver/model/itemcontainer/PcInventory.java
View File

@ -21,12 +21,11 @@ package com.l2jserver.gameserver.model.itemcontainer;
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.datatables.ItemTable;
@ -141,7 +140,7 @@ public class PcInventory extends Inventory
public L2ItemInstance[] getUniqueItems(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable)
{
FastList<L2ItemInstance> list = FastList.newInstance();
final ArrayList<L2ItemInstance> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item == null)
@ -172,7 +171,6 @@ public class PcInventory extends Inventory
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
FastList.recycle(list);
return result;
}
@ -190,7 +188,7 @@ public class PcInventory extends Inventory
public L2ItemInstance[] getUniqueItemsByEnchantLevel(boolean allowAdena, boolean allowAncientAdena, boolean onlyAvailable)
{
FastList<L2ItemInstance> list = FastList.newInstance();
final ArrayList<L2ItemInstance> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item == null)
@ -223,7 +221,6 @@ public class PcInventory extends Inventory
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
FastList.recycle(list);
return result;
}
@ -245,7 +242,7 @@ public class PcInventory extends Inventory
*/
public L2ItemInstance[] getAllItemsByItemId(int itemId, boolean includeEquipped)
{
FastList<L2ItemInstance> list = FastList.newInstance();
final ArrayList<L2ItemInstance> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item == null)
@ -260,7 +257,6 @@ public class PcInventory extends Inventory
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
FastList.recycle(list);
return result;
}
@ -284,7 +280,7 @@ public class PcInventory extends Inventory
*/
public L2ItemInstance[] getAllItemsByItemId(int itemId, int enchantment, boolean includeEquipped)
{
FastList<L2ItemInstance> list = FastList.newInstance();
final ArrayList<L2ItemInstance> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if (item == null)
@ -299,7 +295,6 @@ public class PcInventory extends Inventory
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
FastList.recycle(list);
return result;
}
@ -312,7 +307,7 @@ public class PcInventory extends Inventory
*/
public L2ItemInstance[] getAvailableItems(boolean allowAdena, boolean allowNonTradeable, boolean feightable)
{
FastList<L2ItemInstance> list = FastList.newInstance();
final ArrayList<L2ItemInstance> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item == null) || !item.isAvailable(getOwner(), allowAdena, allowNonTradeable) || !canManipulateWithItemId(item.getId()))
@ -333,7 +328,6 @@ public class PcInventory extends Inventory
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
FastList.recycle(list);
return result;
}
@ -344,7 +338,7 @@ public class PcInventory extends Inventory
*/
public L2ItemInstance[] getAugmentedItems()
{
FastList<L2ItemInstance> list = FastList.newInstance();
final ArrayList<L2ItemInstance> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item != null) && item.isAugmented())
@ -354,7 +348,6 @@ public class PcInventory extends Inventory
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
FastList.recycle(list);
return result;
}
@ -365,7 +358,7 @@ public class PcInventory extends Inventory
*/
public L2ItemInstance[] getElementItems()
{
FastList<L2ItemInstance> list = FastList.newInstance();
final ArrayList<L2ItemInstance> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item != null) && (item.getElementals() != null))
@ -375,7 +368,6 @@ public class PcInventory extends Inventory
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
FastList.recycle(list);
return result;
}
@ -387,7 +379,7 @@ public class PcInventory extends Inventory
*/
public TradeItem[] getAvailableItems(TradeList tradeList)
{
FastList<TradeItem> list = FastList.newInstance();
final ArrayList<TradeItem> list = new ArrayList<>();
for (L2ItemInstance item : _items)
{
if ((item != null) && item.isAvailable(getOwner(), false, false))
@ -401,7 +393,6 @@ public class PcInventory extends Inventory
}
TradeItem[] result = list.toArray(new TradeItem[list.size()]);
FastList.recycle(list);
return result;
}