Sync with L2jServer HighFive Aug 10th 2015.

This commit is contained in:
MobiusDev
2015-08-10 16:00:44 +00:00
parent 5d66d96eff
commit cd6d0d7188
7 changed files with 199 additions and 175 deletions

View File

@@ -28,8 +28,8 @@ import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
@@ -134,8 +134,8 @@ public class L2Clan implements IIdentifiable, INamable
private int _bloodOathCount;
private final ItemContainer _warehouse = new ClanWarehouse(this);
private final List<Integer> _atWarWith = new CopyOnWriteArrayList<>();
private final List<Integer> _atWarAttackers = new CopyOnWriteArrayList<>();
private final Set<Integer> _atWarWith = ConcurrentHashMap.newKeySet();
private final Set<Integer> _atWarAttackers = ConcurrentHashMap.newKeySet();
private Forum _forum;
@@ -1598,7 +1598,7 @@ public class L2Clan implements IIdentifiable, INamable
return _warehouse;
}
public boolean isAtWarWith(Integer id)
public boolean isAtWarWith(int id)
{
return _atWarWith.contains(id);
}
@@ -1658,12 +1658,12 @@ public class L2Clan implements IIdentifiable, INamable
return (_atWarWith != null) && !_atWarWith.isEmpty();
}
public List<Integer> getWarList()
public Set<Integer> getWarList()
{
return _atWarWith;
}
public List<Integer> getAttackerList()
public Set<Integer> getAttackerList()
{
return _atWarAttackers;
}