Browse Source

Javolution 5.5. Thx Onepamopa for testing.
Remove message about not published item (can happen on relog).
RequestProcedureCropList fix divide by 0.

JIV 15 years ago
parent
commit
f4f4c5da02
32 changed files with 60 additions and 54 deletions
  1. 12 12
      L2_GameServer/.classpath
  2. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/GameTimeController.java
  3. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/GmListTable.java
  4. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/LoginServerThread.java
  5. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java
  6. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java
  7. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/datatables/SpawnTable.java
  8. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java
  9. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/ChanceSkillList.java
  10. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/L2Manor.java
  11. 3 3
      L2_GameServer/java/com/l2jserver/gameserver/model/L2World.java
  12. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/model/L2WorldRegion.java
  13. 3 3
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Attackable.java
  14. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java
  15. 4 3
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java
  16. 3 3
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java
  17. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/model/actor/knownlist/ObjectKnownList.java
  18. 2 2
      L2_GameServer/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java
  19. 7 2
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java
  20. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java
  21. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java
  22. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java
  23. 1 1
      L2_GameServer/java/com/l2jserver/gameserver/util/MinionList.java
  24. 1 1
      L2_GameServer/java/com/l2jserver/loginserver/GameServerTable.java
  25. 2 2
      L2_GameServer/java/com/l2jserver/loginserver/LoginController.java
  26. 1 1
      L2_GameServer/java/com/l2jserver/util/WorldObjectMap.java
  27. 1 1
      L2_GameServer/java/com/l2jserver/util/WorldObjectSet.java
  28. 1 1
      L2_GameServer/launcher/L2 AccountManager.launch
  29. 1 1
      L2_GameServer/launcher/L2 GameServer.launch
  30. 1 1
      L2_GameServer/launcher/L2 LoginServer.launch
  31. BIN
      L2_GameServer/lib/javolution-5.3.1.jar
  32. BIN
      L2_GameServer/lib/javolution-5.5.0.jar

+ 12 - 12
L2_GameServer/.classpath

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
 <classpath>
-	<classpathentry excluding="**/.svn/*|.svn" kind="src" path="java" />
-	<classpathentry excluding="**/.svn/*|.svn" kind="src" path="javaTest" />
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4" />
-	<classpathentry kind="lib" path="lib/jython.jar" />
-	<classpathentry kind="lib" path="lib/c3p0-0.9.1.2.jar" />
-	<classpathentry kind="lib" path="lib/mmocore.jar" />
-	<classpathentry kind="lib" path="lib/netcon.jar" />
-	<classpathentry kind="lib" path="lib/jython-engine.jar" />
-	<classpathentry kind="lib" path="lib/javolution-5.3.1.jar" />
-	<classpathentry kind="lib" path="lib/trove-2.1.0.jar" />
-	<classpathentry kind="output" path="bin" />
+	<classpathentry excluding="**/.svn/*|.svn" kind="src" path="java"/>
+	<classpathentry excluding="**/.svn/*|.svn" kind="src" path="javaTest"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
+	<classpathentry kind="lib" path="lib/jython.jar"/>
+	<classpathentry kind="lib" path="lib/c3p0-0.9.1.2.jar"/>
+	<classpathentry kind="lib" path="lib/mmocore.jar"/>
+	<classpathentry kind="lib" path="lib/netcon.jar"/>
+	<classpathentry kind="lib" path="lib/jython-engine.jar"/>
+	<classpathentry kind="lib" path="lib/trove-2.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/javolution-5.5.0.jar"/>
+	<classpathentry kind="output" path="bin"/>
 </classpath>
 </classpath>

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/GameTimeController.java

@@ -41,7 +41,7 @@ public class GameTimeController
 	protected static boolean _isNight = false;
 	protected static boolean _isNight = false;
 	protected static boolean _interruptRequest = false;
 	protected static boolean _interruptRequest = false;
 	
 	
-	private static final FastMap<Integer, L2Character> _movingObjects = new FastMap<Integer, L2Character>().setShared(true);
+	private static final FastMap<Integer, L2Character> _movingObjects = new FastMap<Integer, L2Character>().shared();
 	private static final FastList<L2Character> _toDelete = new FastList<L2Character>(20);
 	private static final FastList<L2Character> _toDelete = new FastList<L2Character>(20);
 	
 	
 	protected static TimerThread _timer;
 	protected static TimerThread _timer;

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/GmListTable.java

@@ -68,7 +68,7 @@ public class GmListTable
 	
 	
 	private GmListTable()
 	private GmListTable()
 	{
 	{
-		_gmList = new FastMap<L2PcInstance, Boolean>().setShared(true);
+		_gmList = new FastMap<L2PcInstance, Boolean>().shared();
 	}
 	}
 	
 	
 	/**
 	/**

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/LoginServerThread.java

@@ -121,7 +121,7 @@ public class LoginServerThread extends Thread
 		_gameExternalHost = Config.EXTERNAL_HOSTNAME;
 		_gameExternalHost = Config.EXTERNAL_HOSTNAME;
 		_gameInternalHost = Config.INTERNAL_HOSTNAME;
 		_gameInternalHost = Config.INTERNAL_HOSTNAME;
 		_waitingClients = new FastList<WaitingClient>();
 		_waitingClients = new FastList<WaitingClient>();
-		_accountsInGameServer = new FastMap<String, L2GameClient>().setShared(true);
+		_accountsInGameServer = new FastMap<String, L2GameClient>().shared();
 		_maxPlayer = Config.MAXIMUM_ONLINE_USERS;
 		_maxPlayer = Config.MAXIMUM_ONLINE_USERS;
 	}
 	}
 	
 	

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/cache/WarehouseCacheManager.java

@@ -37,7 +37,7 @@ public class WarehouseCacheManager
 	private WarehouseCacheManager()
 	private WarehouseCacheManager()
 	{
 	{
 		_cacheTime = Config.WAREHOUSE_CACHE_TIME * 60000L; // 60*1000 = 60000
 		_cacheTime = Config.WAREHOUSE_CACHE_TIME * 60000L; // 60*1000 = 60000
-		_cachedWh = new FastMap<L2PcInstance, Long>().setShared(true);
+		_cachedWh = new FastMap<L2PcInstance, Long>().shared();
 		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new CacheScheduler(), 120000, 60000);
 		ThreadPoolManager.getInstance().scheduleAiAtFixedRate(new CacheScheduler(), 120000, 60000);
 	}
 	}
 	
 	

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/communitybbs/Manager/RegionBBSManager.java

@@ -261,8 +261,8 @@ public class RegionBBSManager extends BaseBBSManager
 	}
 	}
 	private int _onlineCount = 0;
 	private int _onlineCount = 0;
 	private int _onlineCountGm = 0;
 	private int _onlineCountGm = 0;
-	private static FastMap<Integer, FastList<L2PcInstance>> _onlinePlayers = new FastMap<Integer, FastList<L2PcInstance>>().setShared(true);
-	private static FastMap<Integer, FastMap<String, String>> _communityPages = new FastMap<Integer, FastMap<String, String>>().setShared(true);
+	private static FastMap<Integer, FastList<L2PcInstance>> _onlinePlayers = new FastMap<Integer, FastList<L2PcInstance>>().shared();
+	private static FastMap<Integer, FastMap<String, String>> _communityPages = new FastMap<Integer, FastMap<String, String>>().shared();
 	
 	
 	/**
 	/**
 	 * @return
 	 * @return

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/datatables/SpawnTable.java

@@ -39,7 +39,7 @@ public class SpawnTable
 {
 {
 	private static Logger _log = Logger.getLogger(SpawnTable.class.getName());
 	private static Logger _log = Logger.getLogger(SpawnTable.class.getName());
 	
 	
-	private Map<Integer, L2Spawn> _spawntable = new FastMap<Integer, L2Spawn>().setShared(true);
+	private Map<Integer, L2Spawn> _spawntable = new FastMap<Integer, L2Spawn>().shared();
 	private int _npcSpawnCount;
 	private int _npcSpawnCount;
 	private int _customSpawnCount;
 	private int _customSpawnCount;
 	
 	

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/instancemanager/AntiFeedManager.java

@@ -34,7 +34,7 @@ public class AntiFeedManager
 
 
 	private AntiFeedManager()
 	private AntiFeedManager()
 	{
 	{
-		_lastDeathTimes = new FastMap<Integer,Long>().setShared(true);
+		_lastDeathTimes = new FastMap<Integer,Long>().shared();
 	}
 	}
 
 
 	/**
 	/**

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/ChanceSkillList.java

@@ -40,7 +40,7 @@ public class ChanceSkillList extends FastMap<IChanceSkillTrigger, ChanceConditio
 	public ChanceSkillList(L2Character owner)
 	public ChanceSkillList(L2Character owner)
 	{
 	{
 		super();
 		super();
-		setShared(true);
+		shared();
 		_owner = owner;
 		_owner = owner;
 	}
 	}
 
 

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/L2Manor.java

@@ -42,7 +42,7 @@ public class L2Manor
 	
 	
 	private L2Manor()
 	private L2Manor()
 	{
 	{
-		_seeds = new FastMap<Integer, SeedData>().setShared(true);
+		_seeds = new FastMap<Integer, SeedData>().shared();
 		parseData();
 		parseData();
 	}
 	}
 	
 	

+ 3 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/L2World.java

@@ -83,9 +83,9 @@ public final class L2World
 	private L2World()
 	private L2World()
 	{
 	{
 		//_allGms	 = new FastMap<String, L2PcInstance>();
 		//_allGms	 = new FastMap<String, L2PcInstance>();
-		_allPlayers = new FastMap<Integer, L2PcInstance>().setShared(true);
-		_petsInstance = new FastMap<Integer, L2PetInstance>().setShared(true);
-		_allObjects = new FastMap<Integer, L2Object>().setShared(true);
+		_allPlayers = new FastMap<Integer, L2PcInstance>().shared();
+		_petsInstance = new FastMap<Integer, L2PetInstance>().shared();
+		_allObjects = new FastMap<Integer, L2Object>().shared();
 		
 		
 		initRegions();
 		initRegions();
 	}
 	}

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/L2WorldRegion.java

@@ -60,8 +60,8 @@ public final class L2WorldRegion
 
 
     public L2WorldRegion(int pTileX, int pTileY)
     public L2WorldRegion(int pTileX, int pTileY)
     {
     {
-        _allPlayable = new FastMap<Integer, L2Playable>().setShared(true);
-        _visibleObjects = new FastMap<Integer, L2Object>().setShared(true);
+        _allPlayable = new FastMap<Integer, L2Playable>().shared();
+        _visibleObjects = new FastMap<Integer, L2Object>().shared();
         _surroundingRegions = new ArrayList<L2WorldRegion>();
         _surroundingRegions = new ArrayList<L2WorldRegion>();
 
 
         _tileX = pTileX;
         _tileX = pTileX;

+ 3 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Attackable.java

@@ -251,7 +251,7 @@ public class L2Attackable extends L2Npc
 		public int getCount() { return _count;}
 		public int getCount() { return _count;}
 	}
 	}
 
 
-	private FastMap<L2Character, AggroInfo> _aggroList = new FastMap<L2Character, AggroInfo>().setShared(true);
+	private FastMap<L2Character, AggroInfo> _aggroList = new FastMap<L2Character, AggroInfo>().shared();
 
 
 	public final FastMap<L2Character, AggroInfo> getAggroList()
 	public final FastMap<L2Character, AggroInfo> getAggroList()
 	{
 	{
@@ -305,7 +305,7 @@ public class L2Attackable extends L2Npc
 
 
 	private boolean _absorbed;
 	private boolean _absorbed;
 
 
-	private FastMap<L2PcInstance, AbsorberInfo> _absorbersList = new FastMap<L2PcInstance, AbsorberInfo>().setShared(true);
+	private FastMap<L2PcInstance, AbsorberInfo> _absorbersList = new FastMap<L2PcInstance, AbsorberInfo>().shared();
 
 
 	private boolean _mustGiveExpSp;
 	private boolean _mustGiveExpSp;
 
 
@@ -568,7 +568,7 @@ public class L2Attackable extends L2Npc
 	protected void calculateRewards(L2Character lastAttacker)
 	protected void calculateRewards(L2Character lastAttacker)
 	{
 	{
 		// Creates an empty list of rewards
 		// Creates an empty list of rewards
-		FastMap<L2Character, RewardInfo> rewards = new FastMap<L2Character, RewardInfo>().setShared(true);
+		FastMap<L2Character, RewardInfo> rewards = new FastMap<L2Character, RewardInfo>().shared();
 		try
 		try
 		{
 		{
 			if (getAggroList().isEmpty())
 			if (getAggroList().isEmpty())

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -383,7 +383,7 @@ public abstract class L2Character extends L2Object
 			else
 			else
 			{
 			{
 				// Initialize the FastMap _skills to null
 				// Initialize the FastMap _skills to null
-				_skills = new FastMap<Integer,L2Skill>().setShared(true);
+				_skills = new FastMap<Integer,L2Skill>().shared();
 			}
 			}
 
 
 			Formulas.addFuncsToNewCharacter(this);
 			Formulas.addFuncsToNewCharacter(this);

+ 4 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -713,10 +713,10 @@ public final class L2PcInstance extends L2Playable
 
 
 	protected boolean _inventoryDisable = false;
 	protected boolean _inventoryDisable = false;
 
 
-	protected Map<Integer, L2CubicInstance> _cubics = new FastMap<Integer, L2CubicInstance>().setShared(true);
+	protected Map<Integer, L2CubicInstance> _cubics = new FastMap<Integer, L2CubicInstance>().shared();
 
 
 	/** Active shots. A FastSet variable would actually suffice but this was changed to fix threading stability... */
 	/** Active shots. A FastSet variable would actually suffice but this was changed to fix threading stability... */
-	protected Map<Integer, Integer> _activeSoulShots = new FastMap<Integer, Integer>().setShared(true);
+	protected Map<Integer, Integer> _activeSoulShots = new FastMap<Integer, Integer>().shared();
 
 
 	public final ReentrantLock soulShotLock = new ReentrantLock();
 	public final ReentrantLock soulShotLock = new ReentrantLock();
 
 
@@ -4913,6 +4913,7 @@ public final class L2PcInstance extends L2Playable
             sendPacket(msg);
             sendPacket(msg);
             return;
             return;
         }
         }
+        setQueuedSkill(null, false, false);
         if(isMounted())
         if(isMounted())
         {
         {
         	// Get off the strider or something else if character is mounted
         	// Get off the strider or something else if character is mounted
@@ -13053,7 +13054,7 @@ public final class L2PcInstance extends L2Playable
     	}
     	}
     }
     }
 
 
-	private FastMap<Integer, TimeStamp> _reuseTimeStamps = new FastMap<Integer, TimeStamp>().setShared(true);
+	private FastMap<Integer, TimeStamp> _reuseTimeStamps = new FastMap<Integer, TimeStamp>().shared();
 	private boolean _canFeed;
 	private boolean _canFeed;
 	private int _afroId = 0;
 	private int _afroId = 0;
 	private boolean _isInSiege;
 	private boolean _isInSiege;

+ 3 - 3
L2_GameServer/java/com/l2jserver/gameserver/model/actor/knownlist/CharKnownList.java

@@ -235,19 +235,19 @@ public class CharKnownList extends ObjectKnownList
 
 
     public final Map<Integer, L2PcInstance> getKnownPlayers()
     public final Map<Integer, L2PcInstance> getKnownPlayers()
     {
     {
-        if (_knownPlayers == null) _knownPlayers = new FastMap<Integer, L2PcInstance>().setShared(true);
+        if (_knownPlayers == null) _knownPlayers = new FastMap<Integer, L2PcInstance>().shared();
         return _knownPlayers;
         return _knownPlayers;
     }
     }
 
 
     public final Map<Integer, Integer> getKnownRelations()
     public final Map<Integer, Integer> getKnownRelations()
     {
     {
-        if (_knownRelations == null) _knownRelations = new FastMap<Integer, Integer>().setShared(true);
+        if (_knownRelations == null) _knownRelations = new FastMap<Integer, Integer>().shared();
         return _knownRelations;
         return _knownRelations;
     }
     }
 
 
     public final Map<Integer, L2Summon> getKnownSummons()
     public final Map<Integer, L2Summon> getKnownSummons()
     {
     {
-        if (_knownSummons == null) _knownSummons = new FastMap<Integer, L2Summon>().setShared(true);
+        if (_knownSummons == null) _knownSummons = new FastMap<Integer, L2Summon>().shared();
         return _knownSummons;
         return _knownSummons;
     }
     }
     
     

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/model/actor/knownlist/ObjectKnownList.java

@@ -190,7 +190,7 @@ public class ObjectKnownList
     /** Return the _knownObjects containing all L2Object known by the L2Character. */
     /** Return the _knownObjects containing all L2Object known by the L2Character. */
     public final Map<Integer, L2Object> getKnownObjects()
     public final Map<Integer, L2Object> getKnownObjects()
     {
     {
-        if (_knownObjects == null) _knownObjects = new FastMap<Integer, L2Object>().setShared(true);
+        if (_knownObjects == null) _knownObjects = new FastMap<Integer, L2Object>().shared();
         return _knownObjects;
         return _knownObjects;
     }
     }
 
 

+ 2 - 2
L2_GameServer/java/com/l2jserver/gameserver/model/zone/L2ZoneType.java

@@ -55,8 +55,8 @@ public abstract class L2ZoneType
 	protected L2ZoneType(int id)
 	protected L2ZoneType(int id)
 	{
 	{
 		_id = id;
 		_id = id;
-		_characterList = new FastMap<Integer, L2Character>().setShared(true);
-		_zones = new FastMap<Integer, Integer>().setShared(true);
+		_characterList = new FastMap<Integer, L2Character>().shared();
+		_zones = new FastMap<Integer, Integer>().shared();
 		
 		
 		_checkAffected = false;
 		_checkAffected = false;
 		
 		

+ 7 - 2
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestExRqItemLink.java

@@ -16,6 +16,7 @@ package com.l2jserver.gameserver.network.clientpackets;
 
 
 import java.util.logging.Logger;
 import java.util.logging.Logger;
 
 
+import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2World;
@@ -64,11 +65,15 @@ public class RequestExRqItemLink extends L2GameClientPacket
 			{
 			{
 				L2ItemInstance item = (L2ItemInstance)object;
 				L2ItemInstance item = (L2ItemInstance)object;
 				if (item.isPublished())
 				if (item.isPublished())
+				{
 					client.sendPacket(new ExRpItemLink(item));
 					client.sendPacket(new ExRpItemLink(item));
+				}
 				else
 				else
-					_log.info(getClient()+" requested "+name+" for item which wasnt published! ID:"+_objectId);
+				{
+					if (Config.DEBUG)
+						_log.info(getClient()+" requested "+name+" for item which wasnt published! ID:"+_objectId);
+				}
 			}
 			}
 		}
 		}
 	}
 	}
-	
 }
 }

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestProcureCropList.java

@@ -303,7 +303,7 @@ public class RequestProcureCropList extends L2GameClientPacket
 			{
 			{
 				return false;
 				return false;
 			}
 			}
-			if (_crop == null || _crop.getId() == 0 || _crop.getPrice() == 0)
+			if (_crop == null || _crop.getId() == 0 || _crop.getPrice() == 0 || _count == 0)
 				return false;
 				return false;
 
 
 			if (_count > _crop.getAmount())
 			if (_count > _crop.getAmount())

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/taskmanager/AttackStanceTaskManager.java

@@ -41,7 +41,7 @@ public class AttackStanceTaskManager
 {
 {
 	protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName());
 	protected static final Logger _log = Logger.getLogger(AttackStanceTaskManager.class.getName());
 	
 	
-	protected Map<L2Character, Long> _attackStanceTasks = new FastMap<L2Character, Long>().setShared(true);
+	protected Map<L2Character, Long> _attackStanceTasks = new FastMap<L2Character, Long>().shared();
 	
 	
 	private AttackStanceTaskManager()
 	private AttackStanceTaskManager()
 	{
 	{

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/taskmanager/DecayTaskManager.java

@@ -30,7 +30,7 @@ public class DecayTaskManager
 {
 {
 	protected static final Logger _log = Logger.getLogger(DecayTaskManager.class.getName());
 	protected static final Logger _log = Logger.getLogger(DecayTaskManager.class.getName());
 	
 	
-	protected Map<L2Character, Long> _decayTasks = new FastMap<L2Character, Long>().setShared(true);
+	protected Map<L2Character, Long> _decayTasks = new FastMap<L2Character, Long>().shared();
 	
 	
 	public static final int RAID_BOSS_DECAY_TIME = 30000;
 	public static final int RAID_BOSS_DECAY_TIME = 30000;
 	public static final int ATTACKABLE_DECAY_TIME = 8500;
 	public static final int ATTACKABLE_DECAY_TIME = 8500;

+ 1 - 1
L2_GameServer/java/com/l2jserver/gameserver/util/MinionList.java

@@ -53,7 +53,7 @@ public class MinionList
 	
 	
 	/** List containing the current spawned minions for this L2MonsterInstance */
 	/** List containing the current spawned minions for this L2MonsterInstance */
 	private final List<L2MinionInstance> minionReferences;
 	private final List<L2MinionInstance> minionReferences;
-	protected FastMap<Long, Integer> _respawnTasks = new FastMap<Long, Integer>().setShared(true);
+	protected FastMap<Long, Integer> _respawnTasks = new FastMap<Long, Integer>().shared();
 	private final L2MonsterInstance master;
 	private final L2MonsterInstance master;
 	
 	
 	public MinionList(L2MonsterInstance pMaster)
 	public MinionList(L2MonsterInstance pMaster)

+ 1 - 1
L2_GameServer/java/com/l2jserver/loginserver/GameServerTable.java

@@ -56,7 +56,7 @@ public class GameServerTable
 	private static Map<Integer, String> _serverNames = new FastMap<Integer, String>();
 	private static Map<Integer, String> _serverNames = new FastMap<Integer, String>();
 	
 	
 	// Game Server Table
 	// Game Server Table
-	private Map<Integer, GameServerInfo> _gameServerTable = new FastMap<Integer, GameServerInfo>().setShared(true);
+	private Map<Integer, GameServerInfo> _gameServerTable = new FastMap<Integer, GameServerInfo>().shared();
 	
 	
 	// RSA Config
 	// RSA Config
 	private static final int KEYS_SIZE = 10;
 	private static final int KEYS_SIZE = 10;

+ 2 - 2
L2_GameServer/java/com/l2jserver/loginserver/LoginController.java

@@ -62,9 +62,9 @@ public class LoginController
 	protected FastSet<L2LoginClient> _clients = new FastSet<L2LoginClient>();
 	protected FastSet<L2LoginClient> _clients = new FastSet<L2LoginClient>();
 	
 	
 	/** Authed Clients on LoginServer*/
 	/** Authed Clients on LoginServer*/
-	protected FastMap<String, L2LoginClient> _loginServerClients = new FastMap<String, L2LoginClient>().setShared(true);
+	protected FastMap<String, L2LoginClient> _loginServerClients = new FastMap<String, L2LoginClient>().shared();
 	
 	
-	private Map<String, BanInfo> _bannedIps = new FastMap<String, BanInfo>().setShared(true);
+	private Map<String, BanInfo> _bannedIps = new FastMap<String, BanInfo>().shared();
 	
 	
 	private Map<InetAddress, FailedLoginAttempt> _hackProtection;
 	private Map<InetAddress, FailedLoginAttempt> _hackProtection;
 	
 	

+ 1 - 1
L2_GameServer/java/com/l2jserver/util/WorldObjectMap.java

@@ -39,7 +39,7 @@ import javolution.util.FastMap;
 
 
 public class WorldObjectMap<T extends L2Object> extends L2ObjectMap<T>
 public class WorldObjectMap<T extends L2Object> extends L2ObjectMap<T>
 {
 {
-    Map<Integer, T> _objectMap = new FastMap<Integer, T>().setShared(true);
+    Map<Integer, T> _objectMap = new FastMap<Integer, T>().shared();
 
 
     /* (non-Javadoc)
     /* (non-Javadoc)
      * @see com.l2jserver.util.L2ObjectMap#size()
      * @see com.l2jserver.util.L2ObjectMap#size()

+ 1 - 1
L2_GameServer/java/com/l2jserver/util/WorldObjectSet.java

@@ -43,7 +43,7 @@ public class WorldObjectSet<T extends L2Object> extends L2ObjectSet<T>
 
 
     public WorldObjectSet()
     public WorldObjectSet()
     {
     {
-        _objectMap = new FastMap<Integer, T>().setShared(true);
+        _objectMap = new FastMap<Integer, T>().shared();
     }
     }
 
 
     /* (non-Javadoc)
     /* (non-Javadoc)

+ 1 - 1
L2_GameServer/launcher/L2 AccountManager.launch

@@ -10,7 +10,7 @@
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;L2_GameServer&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <stringAttribute key="org.eclipse.debug.core.source_locator_memento" value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;sourceLookupDirector&gt;&#13;&#10;&lt;sourceContainers duplicates=&quot;false&quot;&gt;&#13;&#10;&lt;container memento=&quot;&amp;lt;?xml version=&amp;quot;1.0&amp;quot; encoding=&amp;quot;UTF-8&amp;quot; standalone=&amp;quot;no&amp;quot;?&amp;gt;&amp;#13;&amp;#10;&amp;lt;javaProject name=&amp;quot;L2_GameServer&amp;quot;/&amp;gt;&amp;#13;&amp;#10;&quot; typeId=&quot;org.eclipse.jdt.launching.sourceContainer.javaProject&quot;/&gt;&#13;&#10;&lt;/sourceContainers&gt;&#13;&#10;&lt;/sourceLookupDirector&gt;&#13;&#10;"/>
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
 <listAttribute key="org.eclipse.jdt.launching.CLASSPATH">
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/L2_GameServer/lib/javolution-5.3.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/L2_GameServer/lib/javolution-5.5.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/L2_GameServer/lib/c3p0-0.9.1.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/L2_GameServer/lib/c3p0-0.9.1.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/L2_GameServer/lib/mysql-connector-java-5.1.11-bin.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry internalArchive=&quot;/L2_GameServer/lib/mysql-connector-java-5.1.11-bin.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;L2_GameServer&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry path=&quot;3&quot; projectName=&quot;L2_GameServer&quot; type=&quot;1&quot;/&gt;&#13;&#10;"/>

+ 1 - 1
L2_GameServer/launcher/L2 GameServer.launch

@@ -21,7 +21,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/c3p0-0.9.1.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/c3p0-0.9.1.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/ecj.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/ecj.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/java-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/java-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/javolution-5.3.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/javolution-5.5.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mmocore.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mmocore.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>

+ 1 - 1
L2_GameServer/launcher/L2 LoginServer.launch

@@ -21,7 +21,7 @@
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/c3p0-0.9.1.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/c3p0-0.9.1.2.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/ecj.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/ecj.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/java-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/java-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
-<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/javolution-5.3.1.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
+<listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/javolution-5.5.0.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/jython-engine.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mmocore.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>
 <listEntry value="&lt;?xml version=&quot;1.0&quot; encoding=&quot;UTF-8&quot; standalone=&quot;no&quot;?&gt;&#13;&#10;&lt;runtimeClasspathEntry externalArchive=&quot;L2_GameServer/lib/mmocore.jar&quot; path=&quot;3&quot; type=&quot;2&quot;/&gt;&#13;&#10;"/>

BIN
L2_GameServer/lib/javolution-5.3.1.jar


BIN
L2_GameServer/lib/javolution-5.5.0.jar