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/Castle.java
View File

@@ -23,10 +23,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.ConcurrentHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -243,7 +243,7 @@ public final class Castle extends AbstractResidence
{
super(castleId);
load();
_function = new HashMap<>();
_function = new ConcurrentHashMap<>();
initResidenceZone();
spawnSideNpcs();
if (getOwnerId() != 0)
@@ -260,11 +260,7 @@ public final class Castle extends AbstractResidence
*/
public CastleFunction getFunction(int type)
{
if (_function.containsKey(type))
{
return _function.get(type);
}
return null;
return _function.get(type);
}
public synchronized void engrave(L2Clan clan, L2Object target, CastleSide side)