lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Sync with L2jServer HighFive Mar 25th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-03-25 06:48:51 +00:00
parent e0c66b1412
commit 82606870c0
194 changed files with 2619 additions and 2869 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/java/com/l2jserver/gameserver/model/entity/ClanHall.java
View File

@@ -22,8 +22,8 @@ import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -212,7 +212,7 @@ public abstract class ClanHall
_ownerId = set.getInt("ownerId");
_desc = set.getString("desc");
_location = set.getString("location");
_functions = new HashMap<>();
_functions = new ConcurrentHashMap<>();
if (_ownerId > 0)
{
@@ -306,11 +306,7 @@ public abstract class ClanHall
*/
public ClanHallFunction getFunction(int type)
{
if (_functions.get(type) != null)
{
return _functions.get(type);
}
return null;
return _functions.get(type);
}
/**