diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 45a12bc8f7..6577acd11a 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index bed3089b4c..7ed459261c 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index bed3089b4c..7ed459261c 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index bed3089b4c..7ed459261c 100644 --- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 340999aed8..bb44ae7388 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; @@ -101,8 +100,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private double _collisionRadiusGrown; private double _collisionHeightGrown; @@ -601,7 +600,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -610,7 +609,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -633,12 +632,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 340999aed8..bb44ae7388 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import org.l2jmobius.Config; import org.l2jmobius.commons.util.Rnd; @@ -101,8 +100,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private double _collisionRadiusGrown; private double _collisionHeightGrown; @@ -601,7 +600,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -610,7 +609,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -633,12 +632,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e6b3a6e1ed..b9d22863d9 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -663,7 +662,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -672,7 +671,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -696,12 +695,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); + // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e6b3a6e1ed..b9d22863d9 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -663,7 +662,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -672,7 +671,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -696,12 +695,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); + // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e6b3a6e1ed..b9d22863d9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -663,7 +662,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -672,7 +671,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -696,12 +695,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); + // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e168e7199c..cde1af5ba9 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -112,8 +111,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -678,7 +677,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -687,7 +686,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -711,12 +710,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); + // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e168e7199c..cde1af5ba9 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -112,8 +111,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -678,7 +677,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -687,7 +686,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -711,12 +710,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); + // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index e168e7199c..cde1af5ba9 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -112,8 +111,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -678,7 +677,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -687,7 +686,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -711,12 +710,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); + // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index 827115a4dd..8f08852f79 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index f40616488d..8b0260ba4b 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -677,7 +676,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -686,7 +685,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -710,12 +709,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index f40616488d..8b0260ba4b 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -677,7 +676,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -686,7 +685,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -710,12 +709,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java index f40616488d..8b0260ba4b 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.logging.Logger; import org.l2jmobius.Config; @@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable private Map> _aiSkillLists; private Set _clans; private Set _ignoreClanNpcIds; - private CopyOnWriteArrayList _dropListDeath; - private CopyOnWriteArrayList _dropListSpoil; + private List _dropListDeath; + private List _dropListSpoil; private float _collisionRadiusGrown; private float _collisionHeightGrown; private int _mpRewardValue; @@ -677,7 +676,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListDeath == null) { - _dropListDeath = new CopyOnWriteArrayList<>(); + _dropListDeath = new ArrayList<>(1); } _dropListDeath.add(dropHolder); } @@ -686,7 +685,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable { if (_dropListSpoil == null) { - _dropListSpoil = new CopyOnWriteArrayList<>(); + _dropListSpoil = new ArrayList<>(1); } _dropListSpoil.add(dropHolder); } @@ -710,12 +709,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable public Collection calculateDrops(DropType dropType, Creature victim, Creature killer) { - if (getDropList(dropType) == null) + final List templateList = getDropList(dropType); + if (templateList == null) { return null; } - final List dropList = new ArrayList<>(getDropList(dropType)); + final List dropList = new ArrayList<>(templateList); // randomize drop order Collections.shuffle(dropList);