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

17
trunk/java/com/l2jserver/gameserver/model/entity/clanhall/ClanHallSiegeEngine.java
View File

@ -21,15 +21,14 @@ package com.l2jserver.gameserver.model.entity.clanhall;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.ScheduledFuture;
import java.util.logging.Logger;
import javolution.util.FastList;
import javolution.util.FastMap;
import com.l2jserver.Config;
import com.l2jserver.L2DatabaseFactory;
import com.l2jserver.gameserver.ThreadPoolManager;
@ -74,8 +73,8 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
protected final Logger _log;
private final FastMap<Integer, L2SiegeClan> _attackers = new FastMap<>();
private FastList<L2Spawn> _guards;
private final HashMap<Integer, L2SiegeClan> _attackers = new HashMap<>();
private ArrayList<L2Spawn> _guards;
public SiegableHall _hall;
public ScheduledFuture<?> _siegeTask;
@ -151,7 +150,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
{
if (_guards == null)
{
_guards = new FastList<>();
_guards = new ArrayList<>();
try (Connection con = L2DatabaseFactory.getInstance().getConnection();
PreparedStatement statement = con.prepareStatement(SQL_LOAD_GUARDS))
{
@ -225,7 +224,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
// XXX Attacker clans management -----------------------------
public final FastMap<Integer, L2SiegeClan> getAttackers()
public final HashMap<Integer, L2SiegeClan> getAttackers()
{
return _attackers;
}
@ -262,7 +261,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
@Override
public List<L2SiegeClan> getAttackerClans()
{
FastList<L2SiegeClan> result = new FastList<>();
ArrayList<L2SiegeClan> result = new ArrayList<>();
result.addAll(_attackers.values());
return result;
}
@ -271,7 +270,7 @@ public abstract class ClanHallSiegeEngine extends Quest implements Siegable
public List<L2PcInstance> getAttackersInZone()
{
final Collection<L2PcInstance> list = _hall.getSiegeZone().getPlayersInside();
List<L2PcInstance> attackers = new FastList<>();
List<L2PcInstance> attackers = new ArrayList<>();
for (L2PcInstance pc : list)
{