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

Use of simple ArrayList to store drops.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-07-22 10:21:06 +00:00
parent db65b65a19
commit 0e745ad289
23 changed files with 167 additions and 161 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
@ -101,8 +100,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private double _collisionRadiusGrown; private double _collisionRadiusGrown;
private double _collisionHeightGrown; private double _collisionHeightGrown;
@ -601,7 +600,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -610,7 +609,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -633,12 +632,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
@ -101,8 +100,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private double _collisionRadiusGrown; private double _collisionRadiusGrown;
private double _collisionHeightGrown; private double _collisionHeightGrown;
@ -601,7 +600,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -610,7 +609,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -633,12 +632,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

15
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -663,7 +662,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -672,7 +671,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -696,12 +695,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

15
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -663,7 +662,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -672,7 +671,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -696,12 +695,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

15
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -663,7 +662,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -672,7 +671,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -696,12 +695,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

15
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -112,8 +111,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -678,7 +677,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -687,7 +686,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -711,12 +710,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

15
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -112,8 +111,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -678,7 +677,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -687,7 +686,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -711,12 +710,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

15
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -112,8 +111,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -678,7 +677,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -687,7 +686,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -711,12 +710,14 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -110,8 +109,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -662,7 +661,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -671,7 +670,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -695,12 +694,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -677,7 +676,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -686,7 +685,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -710,12 +709,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -677,7 +676,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -686,7 +685,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -710,12 +709,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

14
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/templates/NpcTemplate.java
View File

@ -22,7 +22,6 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger; import java.util.logging.Logger;
import org.l2jmobius.Config; import org.l2jmobius.Config;
@ -111,8 +110,8 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
private Map<AISkillScope, List<Skill>> _aiSkillLists; private Map<AISkillScope, List<Skill>> _aiSkillLists;
private Set<Integer> _clans; private Set<Integer> _clans;
private Set<Integer> _ignoreClanNpcIds; private Set<Integer> _ignoreClanNpcIds;
private CopyOnWriteArrayList<DropHolder> _dropListDeath; private List<DropHolder> _dropListDeath;
private CopyOnWriteArrayList<DropHolder> _dropListSpoil; private List<DropHolder> _dropListSpoil;
private float _collisionRadiusGrown; private float _collisionRadiusGrown;
private float _collisionHeightGrown; private float _collisionHeightGrown;
private int _mpRewardValue; private int _mpRewardValue;
@ -677,7 +676,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListDeath == null) if (_dropListDeath == null)
{ {
_dropListDeath = new CopyOnWriteArrayList<>(); _dropListDeath = new ArrayList<>(1);
} }
_dropListDeath.add(dropHolder); _dropListDeath.add(dropHolder);
} }
@ -686,7 +685,7 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
{ {
if (_dropListSpoil == null) if (_dropListSpoil == null)
{ {
_dropListSpoil = new CopyOnWriteArrayList<>(); _dropListSpoil = new ArrayList<>(1);
} }
_dropListSpoil.add(dropHolder); _dropListSpoil.add(dropHolder);
} }
@ -710,12 +709,13 @@ public class NpcTemplate extends CreatureTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer) public Collection<ItemHolder> calculateDrops(DropType dropType, Creature victim, Creature killer)
{ {
if (getDropList(dropType) == null) final List<DropHolder> templateList = getDropList(dropType);
if (templateList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType)); final List<DropHolder> dropList = new ArrayList<>(templateList);
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);