Sync with L2jServer HighFive Mar 25th 2015.

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

View File

@ -25,13 +25,11 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
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.CopyOnWriteArraySet;
import java.util.function.Consumer;
import java.util.function.Function;
import java.util.logging.Level;
@ -297,10 +295,7 @@ public abstract class AbstractScript implements INamable
if (!ids.isEmpty())
{
if (!_registeredIds.containsKey(type))
{
_registeredIds.put(type, new CopyOnWriteArraySet<Integer>());
}
_registeredIds.putIfAbsent(type, ConcurrentHashMap.newKeySet(ids.size()));
_registeredIds.get(type).addAll(ids);
}
@ -1374,10 +1369,7 @@ public abstract class AbstractScript implements INamable
}
}
if (!_registeredIds.containsKey(registerType))
{
_registeredIds.put(registerType, new HashSet<Integer>());
}
_registeredIds.putIfAbsent(registerType, ConcurrentHashMap.newKeySet(1));
_registeredIds.get(registerType).add(id);
}
}
@ -1489,10 +1481,7 @@ public abstract class AbstractScript implements INamable
}
}
}
if (!_registeredIds.containsKey(registerType))
{
_registeredIds.put(registerType, new HashSet<Integer>());
}
_registeredIds.putIfAbsent(registerType, ConcurrentHashMap.newKeySet(ids.size()));
_registeredIds.get(registerType).addAll(ids);
}
else