This is includes some optomizations, corrects several issues, and requires [DP4142], thanks Emperorc.

L2_GameServer_T1/java/net/sf/l2j/gameserver/instancemanager/GrandBossManager.java

@@ -3,12 +3,12 @@
  * the terms of the GNU General Public License as published by the Free Software
  * Foundation, either version 3 of the License, or (at your option) any later
  * version.
- * 
+ *
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
  * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
  * details.
- * 
+ *
  * You should have received a copy of the GNU General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
@@ -21,7 +21,6 @@ import java.sql.SQLException;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import javolution.util.FastList;
 import javolution.util.FastMap;
 import net.sf.l2j.L2DatabaseFactory;
 import net.sf.l2j.gameserver.model.L2Character;
@@ -29,360 +28,404 @@ import net.sf.l2j.gameserver.model.L2Object;
 import net.sf.l2j.gameserver.model.actor.instance.L2GrandBossInstance;
 import net.sf.l2j.gameserver.model.zone.type.L2BossZone;
 import net.sf.l2j.gameserver.templates.StatsSet;
+import net.sf.l2j.util.L2FastList;
 
 /**
- * 
+ *
  * @author DaRkRaGe
  * Revised by Emperorc
  */
 public class GrandBossManager
 {
-    /* =========================================================
-     * This class handles all Grand Bosses:
-     * <ul>
-     * <li>22215-22217  Tyrannosaurus</li>
-     * <li>25333-25338  Anakazel</li>
-     * <li>29001        Queen Ant</li>
-     * <li>29006        Core</li>
-     * <li>29014        Orfen</li>
-     * <li>29019        Antharas</li>
-     * <li>29020        Baium</li>
-     * <li>29022        Zaken</li>
-     * <li>29028        Valakas</li>
-     * <li>29045        Frintezza</li>
-     * <li>29046-29047  Scarlet van Halisha</li>
-     * </ul>
-     * 
-     * It handles the saving of hp, mp, location, and status 
-     * of all Grand Bosses. It also manages the zones associated 
-     * with the Grand Bosses. 
-     * NOTE: The current version does NOT spawn the Grand Bosses,
-     * it just stores and retrieves the values on reboot/startup,
-     * for AI scripts to utilize as needed. 
-    */
-
-    private static Logger _log = Logger.getLogger(GrandBossManager.class.getName());
-    private static GrandBossManager _instance;
-    protected static Map<Integer, L2GrandBossInstance> _bosses;
-    protected static Map<Integer, StatsSet> _storedInfo;
-    private Map<Integer,Integer> _bossStatus;
-
-    private FastList<L2BossZone> _zones;
-
-    public static final GrandBossManager getInstance()
-    {
-        if (_instance == null)
-        {
-            _log.info("Initializing GrandBossManager");
-            _instance = new GrandBossManager();
-        }
-        return _instance;
-    }
-    
-    public GrandBossManager()
-    {
-        init();
-    }
-
-    private void init()
-    {
-        _zones = new FastList<L2BossZone>();
-        
-        _bosses = new FastMap<Integer, L2GrandBossInstance>();
-        _storedInfo = new FastMap<Integer, StatsSet>();
-        _bossStatus = new FastMap<Integer, Integer>();
-        Connection con = null;
-        try
-        {
-            con = L2DatabaseFactory.getInstance().getConnection();
-
-            PreparedStatement statement = con.prepareStatement("SELECT * from grandboss_data ORDER BY boss_id");
-            ResultSet rset = statement.executeQuery();
-
-            while (rset.next())
-            {
-                //Read all info from DB, and store it for AI to read and decide what to do
-                //faster than accessing DB in real time
-                StatsSet info = new StatsSet();
-                int bossId = rset.getInt("boss_id");
-                info.set("loc_x", rset.getInt("loc_x"));
-                info.set("loc_y", rset.getInt("loc_y"));
-                info.set("loc_z", rset.getInt("loc_z"));
-                info.set("heading", rset.getInt("heading"));
-                info.set("respawn_time", rset.getLong("respawn_time"));
-                double HP = rset.getDouble("currentHP"); //jython doesn't recognize doubles
-                int true_HP = (int) HP;                  //so use java's ability to type cast
-                info.set("currentHP", true_HP);          //to convert double to int
-                double MP = rset.getDouble("currentMP");
-                int true_MP = (int) MP;
-                info.set("currentMP", true_MP);
-                _bossStatus.put(bossId, rset.getInt("status"));
-
-                _storedInfo.put(bossId, info);
-                info = null;
-            }
-
-            _log.info("GrandBossManager: Loaded " + _storedInfo.size() + " Instances");
-
-            rset.close();
-            statement.close();
-        }
-        catch (SQLException e)
-        {
-            _log.warning("GrandBossManager: Could not load grandboss_data table");
-        }
-        catch (Exception e) {e.printStackTrace();}
-        finally
-        {
-            try {con.close();} catch(Exception e) {e.printStackTrace();}
-        }
-    }
-    
-    /*
-     * Zone Functions
-     */
-    
-    public void initZones()
-    {
-        Connection con = null;
-
-        FastMap<String, FastList<Integer>> zones = new FastMap<String, FastList<Integer>>();
-
-        if (_zones == null)
-        {
-            _log.warning("GrandBossManager: Could not read Grand Boss zone data");
-            return;
-        }
-        
-        for (L2BossZone zone : _zones)
-        {
-            if (zone == null) continue;
-            zones.put(zone.getZoneName(), new FastList<Integer>());
-        }
-        
-        try
-        {
-            con = L2DatabaseFactory.getInstance().getConnection();
-
-            PreparedStatement statement = con.prepareStatement("SELECT * from grandboss_list ORDER BY player_id");
-            ResultSet rset = statement.executeQuery();
-        
-            while (rset.next())
-            {
-                int id = rset.getInt("player_id");
-                String zoneName = rset.getString("zone");
-                zones.get(zoneName).add(id);
-            }
-            
-            rset.close();
-            statement.close();
-
-            _log.info("GrandBossManager: Initialized " + _zones.size() + " Grand Boss Zones");
-        }
-        catch (SQLException e)
-        {
-            _log.warning("GrandBossManager: Could not load grandboss_list table");
-        }
-        catch (Exception e) {e.printStackTrace();}
-        finally
-        {
-            try {con.close();} catch(Exception e) {e.printStackTrace();}
-        }
-        
-        for (L2BossZone zone : _zones)
-        {
-            if (zone == null) continue;
-            zone.setAllowedPlayers(zones.get(zone.getZoneName()));
-        }
-        
-        zones.clear();
-    }
-    
-    public void addZone(L2BossZone zone)
-    {
-        if (_zones != null)
-        {
-            _zones.add(zone);
-        }
-    }
-    
-    public final L2BossZone getZone(L2Character character)
-    {
-        if (_zones != null)
-            for (L2BossZone temp : _zones)
-            {
-                if (temp.isCharacterInZone(character))
-                {
-                    return temp;
-                }
-            }
-        return null;
-    }
-    
-    public final L2BossZone getZone(int x, int y, int z)
-    {
-        if (_zones != null)
-            for (L2BossZone temp : _zones)
-            {
-                if (temp.isInsideZone(x, y, z))
-                {
-                    return temp;
-                }
-            }
-        return null;
-    }
-    
-    public boolean checkIfInZone(String zoneType, L2Object obj)
-    {
-        L2BossZone temp = getZone(obj.getX(), obj.getY(), obj.getZ());
-        if (temp == null)
-        {
-            return false;
-        }
-        return temp.getZoneName().equalsIgnoreCase(zoneType);
-    }
-    
-    /*
-     * The rest
-     */
-    
-    public int getBossStatus(int bossId)
-    {
-        return _bossStatus.get(bossId);
-    }
-
-    public void setBossStatus(int bossId, int status)
-    {
-        _bossStatus.remove(bossId);
-        _bossStatus.put(bossId, status);
-    }
-    /*
-     * Adds a L2GrandBossInstance to the list of bosses.
-     */
-    
-    public void addBoss (L2GrandBossInstance boss)
-    {
-        if (boss != null)
-        {
-            if (_bosses.containsKey(boss.getNpcId()))
-                _bosses.remove(boss.getNpcId());
-            _bosses.put(boss.getNpcId(), boss);
-        }
-    }
-    
-    public L2GrandBossInstance getBoss (int bossId)
-    {
-    	return _bosses.get(bossId);
-    }
-    
-    public StatsSet getStatsSet (int bossId)
-    {
-        return _storedInfo.get(bossId);
-    }
-    
-    public void setStatsSet (int bossId, StatsSet info)
-    {
-        if (_storedInfo.containsKey(bossId))
-            _storedInfo.remove(bossId);
-        _storedInfo.put(bossId, info);
-    }
-    
-    private void storeToDb()
-    {
-        Connection con = null;        
-        PreparedStatement statement = null ;
-        try
-        {
-            con = L2DatabaseFactory.getInstance().getConnection();
-            
-            statement = con.prepareStatement("DELETE FROM grandboss_list");
-            statement.executeUpdate();
-            statement.close();
-        }
-        catch (SQLException e){ _log.warning("GrandBossManager: Couldnt empty grandboss_list table");}
-        finally
-        {
-            try {con.close();} catch(Exception e) {e.printStackTrace();}
-        }
-
-        for (L2BossZone zone : _zones)
-        {
-            con = null;
-            try
-            {
-                con = L2DatabaseFactory.getInstance().getConnection();
-
-                if (zone == null) continue;
-                String name = zone.getZoneName();
-                FastList<Integer> list = zone.getAllowedPlayers();
-                if (list == null) continue;
-                if (list.isEmpty()) continue;
-                for (Integer player : list)
-                {
-                    statement = con.prepareStatement("INSERT INTO grandboss_list (player_id,zone) VALUES (?,?)");
-                    statement.setInt(1, player);
-                    statement.setString(2, name);
-                    statement.executeUpdate();
-                    statement.close();
-                }
-            }
-            catch (SQLException e){ _log.warning("GrandBossManager: Couldnt update grandboss_list table");}
-            finally
-            {
-                try {con.close();} catch(Exception e) {e.printStackTrace();}
-            }
-        }
-
-        for (Integer bossId : _storedInfo.keySet())
-        {
-            con = null;
-            try
-            {
-                con = L2DatabaseFactory.getInstance().getConnection();
-
-                L2GrandBossInstance boss = _bosses.get(bossId);
-    
-                if (boss == null) continue;
-    
-                StatsSet info = _storedInfo.get(bossId);
-    
-                if (info == null) continue;
-    
-                statement = con.prepareStatement("UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?");
-                statement.setInt(1, boss.getX());
-                statement.setInt(2, boss.getY());
-                statement.setInt(3, boss.getZ());
-                statement.setInt(4, boss.getHeading());
-                statement.setLong(5, info.getLong("respawn_time"));
-                statement.setDouble(6, boss.getCurrentHp());
-                statement.setDouble(7, boss.getCurrentMp());
-                statement.setInt(8, _bossStatus.get(bossId));
-                statement.setInt(9, bossId);
-                
-                statement.executeUpdate();
-                statement.close();
-            }
-            catch (SQLException e){ _log.warning("GrandBossManager: Couldnt update grandboss_data table");}
-            finally
-            {
-                try {con.close();} catch(Exception e) {e.printStackTrace();}
-            }
-        }
-    }
-
-    /**
-     * Saves all Grand Boss info and then clears all info from memory,
-     * including all schedules.
-     */
-
-    public void cleanUp()
-    {
-        storeToDb();
-
-       // _bosses.clear();
-       // _storedInfo.clear();
-       // _bossStatus.clear();
-       // _zones.clear();
-    }
+	/* =========================================================
+	 * This class handles all Grand Bosses:
+	 * <ul>
+	 * <li>22215-22217  Tyrannosaurus</li>
+	 * <li>25333-25338  Anakazel</li>
+	 * <li>29001        Queen Ant</li>
+	 * <li>29006        Core</li>
+	 * <li>29014        Orfen</li>
+	 * <li>29019        Antharas</li>
+	 * <li>29020        Baium</li>
+	 * <li>29022        Zaken</li>
+	 * <li>29028        Valakas</li>
+	 * <li>29045        Frintezza</li>
+	 * <li>29046-29047  Scarlet van Halisha</li>
+	 * </ul>
+	 *
+	 * It handles the saving of hp, mp, location, and status
+	 * of all Grand Bosses. It also manages the zones associated
+	 * with the Grand Bosses.
+	 * NOTE: The current version does NOT spawn the Grand Bosses,
+	 * it just stores and retrieves the values on reboot/startup,
+	 * for AI scripts to utilize as needed.
+	*/
+
+	/**
+	 * DELETE FROM grandboss_list
+	 */
+	private static final String DELETE_GRAND_BOSS_LIST = "DELETE FROM grandboss_list";
+
+	/**
+	 * INSERT INTO grandboss_list (player_id,zone) VALUES (?,?)
+	 */
+	private static final String INSERT_GRAND_BOSS_LIST = "INSERT INTO grandboss_list (player_id,zone) VALUES (?,?)";
+
+	/**
+	 * UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?
+	 */
+	private static final String UPDATE_GRAND_BOSS_DATA = "UPDATE grandboss_data set loc_x = ?, loc_y = ?, loc_z = ?, heading = ?, respawn_time = ?, currentHP = ?, currentMP = ?, status = ? where boss_id = ?";
+
+	private static final String UPDATE_GRAND_BOSS_DATA2 = "UPDATE grandboss_data set status = ? where boss_id = ?";
+	
+	private static Logger _log = Logger.getLogger(GrandBossManager.class.getName());
+
+	private static GrandBossManager _instance;
+
+	protected static Map<Integer, L2GrandBossInstance> _bosses;
+
+	protected static Map<Integer, StatsSet> _storedInfo;
+
+	private Map<Integer, Integer> _bossStatus;
+
+	private L2FastList<L2BossZone> _zones;
+
+	public static final GrandBossManager getInstance()
+	{
+		if (_instance == null)
+		{
+			_log.info("Initializing GrandBossManager");
+			_instance = new GrandBossManager();
+		}
+		return _instance;
+	}
+
+	public GrandBossManager()
+	{
+		init();
+	}
+
+	private void init()
+	{
+		_zones = new L2FastList<L2BossZone>();
+
+		_bosses = new FastMap<Integer, L2GrandBossInstance>();
+		_storedInfo = new FastMap<Integer, StatsSet>();
+		_bossStatus = new FastMap<Integer, Integer>();
+		Connection con = null;
+		try
+		{
+			con = L2DatabaseFactory.getInstance().getConnection();
+
+			PreparedStatement statement = con.prepareStatement("SELECT * from grandboss_data ORDER BY boss_id");
+			ResultSet rset = statement.executeQuery();
+
+			while (rset.next())
+			{
+				//Read all info from DB, and store it for AI to read and decide what to do
+				//faster than accessing DB in real time
+				StatsSet info = new StatsSet();
+				int bossId = rset.getInt("boss_id");
+				info.set("loc_x", rset.getInt("loc_x"));
+				info.set("loc_y", rset.getInt("loc_y"));
+				info.set("loc_z", rset.getInt("loc_z"));
+				info.set("heading", rset.getInt("heading"));
+				info.set("respawn_time", rset.getLong("respawn_time"));
+				double HP = rset.getDouble("currentHP"); //jython doesn't recognize doubles
+				int true_HP = (int) HP; //so use java's ability to type cast
+				info.set("currentHP", true_HP); //to convert double to int
+				double MP = rset.getDouble("currentMP");
+				int true_MP = (int) MP;
+				info.set("currentMP", true_MP);
+				_bossStatus.put(bossId, rset.getInt("status"));
+
+				_storedInfo.put(bossId, info);
+				info = null;
+			}
+
+			_log.info("GrandBossManager: Loaded " + _storedInfo.size() + " Instances");
+
+			rset.close();
+			statement.close();
+		}
+		catch (SQLException e)
+		{
+			_log.warning("GrandBossManager: Could not load grandboss_data table");
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+		finally
+		{
+			try
+			{
+				con.close();
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/*
+	 * Zone Functions
+	 */
+
+	public void initZones()
+	{
+		Connection con = null;
+
+		FastMap<String, L2FastList<Integer>> zones = new FastMap<String, L2FastList<Integer>>();
+
+		if (_zones == null)
+		{
+			_log.warning("GrandBossManager: Could not read Grand Boss zone data");
+			return;
+		}
+
+		for (L2BossZone zone : _zones)
+		{
+			if (zone == null)
+				continue;
+			zones.put(zone.getZoneName(), new L2FastList<Integer>());
+		}
+
+		try
+		{
+			con = L2DatabaseFactory.getInstance().getConnection();
+
+			PreparedStatement statement = con.prepareStatement("SELECT * from grandboss_list ORDER BY player_id");
+			ResultSet rset = statement.executeQuery();
+
+			while (rset.next())
+			{
+				int id = rset.getInt("player_id");
+				String zoneName = rset.getString("zone");
+				zones.get(zoneName).add(id);
+			}
+
+			rset.close();
+			statement.close();
+
+			_log.info("GrandBossManager: Initialized " + _zones.size() + " Grand Boss Zones");
+		}
+		catch (SQLException e)
+		{
+			_log.warning("GrandBossManager: Could not load grandboss_list table");
+			e.getMessage();
+		}
+		catch (Exception e)
+		{
+			e.printStackTrace();
+		}
+		finally
+		{
+			try
+			{
+				con.close();
+			}
+			catch (Exception e)
+			{
+			}
+		}
+
+		for (L2BossZone zone : _zones)
+		{
+			if (zone == null)
+				continue;
+			zone.setAllowedPlayers(zones.get(zone.getZoneName()));
+		}
+
+		zones.clear();
+	}
+
+	public void addZone(L2BossZone zone)
+	{
+		if (_zones != null)
+		{
+			_zones.add(zone);
+		}
+	}
+
+	public final L2BossZone getZone(L2Character character)
+	{
+		if (_zones != null)
+			for (L2BossZone temp : _zones)
+			{
+				if (temp.isCharacterInZone(character))
+				{
+					return temp;
+				}
+			}
+		return null;
+	}
+
+	public final L2BossZone getZone(int x, int y, int z)
+	{
+		if (_zones != null)
+			for (L2BossZone temp : _zones)
+			{
+				if (temp.isInsideZone(x, y, z))
+				{
+					return temp;
+				}
+			}
+		return null;
+	}
+
+	public boolean checkIfInZone(String zoneType, L2Object obj)
+	{
+		L2BossZone temp = getZone(obj.getX(), obj.getY(), obj.getZ());
+		if (temp == null)
+		{
+			return false;
+		}
+		return temp.getZoneName().equalsIgnoreCase(zoneType);
+	}
+
+	/*
+	 * The rest
+	 */
+
+	public int getBossStatus(int bossId)
+	{
+		return _bossStatus.get(bossId);
+	}
+
+	public void setBossStatus(int bossId, int status)
+	{
+		_bossStatus.remove(bossId);
+		_bossStatus.put(bossId, status);
+	}
+
+	/*
+	 * Adds a L2GrandBossInstance to the list of bosses.
+	 */
+
+	public void addBoss(L2GrandBossInstance boss)
+	{
+		if (boss != null)
+		{
+			if (_bosses.containsKey(boss.getNpcId()))
+				_bosses.remove(boss.getNpcId());
+			_bosses.put(boss.getNpcId(), boss);
+		}
+	}
+
+	public L2GrandBossInstance getBoss(int bossId)
+	{
+		return _bosses.get(bossId);
+	}
+
+	public StatsSet getStatsSet(int bossId)
+	{
+		return _storedInfo.get(bossId);
+	}
+
+	public void setStatsSet(int bossId, StatsSet info)
+	{
+		if (_storedInfo.containsKey(bossId))
+			_storedInfo.remove(bossId);
+		_storedInfo.put(bossId, info);
+	}
+
+	private void storeToDb()
+	{
+		Connection con = null;
+		PreparedStatement statement = null;
+		try
+		{
+			con = L2DatabaseFactory.getInstance().getConnection();
+
+			statement = con.prepareStatement(DELETE_GRAND_BOSS_LIST);
+			statement.executeUpdate();
+			statement.close();
+
+			for (L2BossZone zone : _zones)
+			{
+				if (zone == null)
+					continue;
+				String name = zone.getZoneName();
+				L2FastList<Integer> list = zone.getAllowedPlayers();
+				if (name == null || list == null || list.isEmpty())
+					continue;
+				for (Integer player : list)
+				{
+					statement = con.prepareStatement(INSERT_GRAND_BOSS_LIST);
+					statement.setInt(1, player);
+					statement.setString(2, name);
+					statement.executeUpdate();
+					statement.close();
+				}
+			}
+
+			for (Integer bossId : _storedInfo.keySet())
+			{
+				L2GrandBossInstance boss = _bosses.get(bossId);
+				StatsSet info = _storedInfo.get(bossId);
+				System.err.println("here"+bossId + info + boss);
+				if (boss == null || info == null)
+				{
+					statement = con.prepareStatement(UPDATE_GRAND_BOSS_DATA2);
+					statement.setInt(1, _bossStatus.get(bossId));
+					statement.setInt(2, bossId);
+				}
+				else
+				{
+					System.err.println("still here"+bossId);
+					statement = con.prepareStatement(UPDATE_GRAND_BOSS_DATA);
+					statement.setInt(1, boss.getX());
+					statement.setInt(2, boss.getY());
+					statement.setInt(3, boss.getZ());
+					statement.setInt(4, boss.getHeading());
+					statement.setLong(5, info.getLong("respawn_time"));
+					double hp = boss.getCurrentHp();
+					double mp = boss.getCurrentMp();
+					if (boss.isDead())
+					{
+						hp = boss.getMaxHp();
+						mp = boss.getMaxMp();
+					}
+					statement.setDouble(6, hp);
+					statement.setDouble(7, mp);
+					statement.setInt(8, _bossStatus.get(bossId));
+					statement.setInt(9, bossId);
+				}
+				statement.executeUpdate();
+				statement.close();
+			}
+		}
+		catch (SQLException e)
+		{
+			_log.warning("GrandBossManager: Couldn't store grandbosses to database:" + e);
+		}
+		finally
+		{
+			try
+			{
+				con.close();
+			}
+			catch (Exception e)
+			{
+				e.printStackTrace();
+			}
+		}
+	}
+
+	/**
+	 * Saves all Grand Boss info and then clears all info from memory,
+	 * including all schedules.
+	 */
+	public void cleanUp()
+	{
+		storeToDb();
+
+		 _bosses.clear();
+		 _storedInfo.clear();
+		 _bossStatus.clear();
+		 _zones.clear();
+	}
 
 }

L2_GameServer_T1/java/net/sf/l2j/gameserver/model/actor/instance/L2GrandBossInstance.java

@@ -14,7 +14,6 @@
  */
 package net.sf.l2j.gameserver.model.actor.instance;
 
-import net.sf.l2j.gameserver.instancemanager.GrandBossManager;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.templates.L2NpcTemplate;
 
@@ -45,7 +44,6 @@ public final class L2GrandBossInstance extends L2MonsterInstance
 	public void onSpawn()
     {
     	super.onSpawn();
-        GrandBossManager.getInstance().addBoss(this);
     }
 
     /**

L2_GameServer_T1/java/net/sf/l2j/gameserver/model/zone/type/L2BossZone.java

@@ -14,13 +14,13 @@
  */
 package net.sf.l2j.gameserver.model.zone.type;
 
-import javolution.util.FastList;
 import javolution.util.FastMap;
 import net.sf.l2j.gameserver.GameServer;
 import net.sf.l2j.gameserver.datatables.MapRegionTable;
 import net.sf.l2j.gameserver.model.L2Character;
 import net.sf.l2j.gameserver.model.actor.instance.L2PcInstance;
 import net.sf.l2j.gameserver.model.zone.L2ZoneType;
+import net.sf.l2j.util.L2FastList;
 
 /**
  * @author DaRkRaGe
@@ -39,13 +39,13 @@ public class L2BossZone extends L2ZoneType
     // track the players admitted to the zone who should be allowed back in 
     // after reboot/server downtime (outside of their control), within 30 
     // of server restart
-    private FastList<Integer> _playersAllowed;
+    private L2FastList<Integer> _playersAllowed;
     
     public L2BossZone(int id)
     {
         super(id);
         _playerAllowedReEntryTimes = new FastMap<Integer, Long>();
-        _playersAllowed = new FastList<Integer>();
+        _playersAllowed = new L2FastList<Integer>();
     }
     
     @Override
@@ -159,13 +159,13 @@ public class L2BossZone extends L2ZoneType
         return _timeInvade;
     }
 
-    public void setAllowedPlayers(FastList<Integer> players)
+    public void setAllowedPlayers(L2FastList<Integer> players)
     {
         if (players != null)
             _playersAllowed = players;
     }
 
-    public FastList<Integer> getAllowedPlayers()
+    public L2FastList<Integer> getAllowedPlayers()
     {
         return _playersAllowed;
     }