-More changes related to Javolution drop.

-Disabled html LazyCache by default.
This commit is contained in:
mobius
2015-02-09 13:11:58 +00:00
parent 303c3c65d2
commit 2452f7ea20
15 changed files with 35 additions and 65 deletions

View File

@ -3002,8 +3002,7 @@ public class L2Clan implements IIdentifiable, INamable
list.add(new SubPledgeSkill(subunit.getId(), skill.getId(), skill.getLevel()));
}
}
SubPledgeSkill[] result = list.toArray(new SubPledgeSkill[list.size()]);
return result;
return list.toArray(new SubPledgeSkill[list.size()]);
}
public void setNewLeaderId(int objectId, boolean storeInDb)

View File

@ -83,7 +83,7 @@ public class L2Party extends AbstractPlayerGroup
private static final Duration PARTY_POSITION_BROADCAST_INTERVAL = Duration.ofSeconds(12);
private static final Duration PARTY_DISTRIBUTION_TYPE_REQUEST_TIMEOUT = Duration.ofSeconds(15);
private final CopyOnWriteArrayList<L2PcInstance> _members;
private final List<L2PcInstance> _members;
private boolean _pendingInvitation = false;
private long _pendingInviteTimeout;
private int _partyLvl = 0;
@ -769,11 +769,11 @@ public class L2Party extends AbstractPlayerGroup
public void distributeAdena(L2PcInstance player, long adena, L2Character target)
{
// Get all the party members
List<L2PcInstance> membersList = getMembers();
final List<L2PcInstance> membersList = getMembers();
// Check the number of party members that must be rewarded
// (The party member must be in range to receive its reward)
List<L2PcInstance> ToReward = new ArrayList<>();
final List<L2PcInstance> ToReward = new ArrayList<>();
for (L2PcInstance member : membersList)
{
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE2, target, member, true))
@ -791,7 +791,7 @@ public class L2Party extends AbstractPlayerGroup
// Now we can actually distribute the adena reward
// (Total adena splitted by the number of party members that are in range and must be rewarded)
long count = adena / ToReward.size();
final long count = adena / ToReward.size();
for (L2PcInstance member : ToReward)
{
member.addAdena("Party", count, player, true);

View File

@ -134,8 +134,7 @@ public class TradeList
inventory.adjustAvailableItem(item);
list.add(item);
}
final TradeItem[] result = list.toArray(new TradeItem[list.size()]);
return result;
return list.toArray(new TradeItem[list.size()]);
}
/**

View File

@ -777,7 +777,7 @@ public final class L2PcInstance extends L2Playable
/** Player's cubics. */
private final Map<Integer, L2CubicInstance> _cubics = new ConcurrentSkipListMap<>();
/** Active shots. */
protected CopyOnWriteArraySet<Integer> _activeSoulShots = new CopyOnWriteArraySet<>();
protected Set<Integer> _activeSoulShots = new CopyOnWriteArraySet<>();
public final ReentrantLock soulShotLock = new ReentrantLock();

View File

@ -169,10 +169,7 @@ public class PcInventory extends Inventory
list.add(item);
}
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
return result;
return list.toArray(new L2ItemInstance[list.size()]);
}
/**
@ -219,10 +216,7 @@ public class PcInventory extends Inventory
list.add(item);
}
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
return result;
return list.toArray(new L2ItemInstance[list.size()]);
}
/**
@ -255,10 +249,7 @@ public class PcInventory extends Inventory
list.add(item);
}
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
return result;
return list.toArray(new L2ItemInstance[list.size()]);
}
/**
@ -293,10 +284,7 @@ public class PcInventory extends Inventory
list.add(item);
}
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
return result;
return list.toArray(new L2ItemInstance[list.size()]);
}
/**
@ -326,10 +314,7 @@ public class PcInventory extends Inventory
list.add(item);
}
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
return result;
return list.toArray(new L2ItemInstance[list.size()]);
}
/**
@ -346,10 +331,7 @@ public class PcInventory extends Inventory
list.add(item);
}
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
return result;
return list.toArray(new L2ItemInstance[list.size()]);
}
/**
@ -366,10 +348,7 @@ public class PcInventory extends Inventory
list.add(item);
}
}
L2ItemInstance[] result = list.toArray(new L2ItemInstance[list.size()]);
return result;
return list.toArray(new L2ItemInstance[list.size()]);
}
/**
@ -391,10 +370,7 @@ public class PcInventory extends Inventory
}
}
}
TradeItem[] result = list.toArray(new TradeItem[list.size()]);
return result;
return list.toArray(new TradeItem[list.size()]);
}
/**