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

Possible fix for duplicated drop lists issue.

Browse Source
This commit is contained in:
MobiusDev 2018-01-29 16:35:21 +00:00
parent b5e821c313
commit 4597d64b3d
6 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@ -689,12 +689,13 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer) public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer)
{ {
final List<DropHolder> dropList = getDropList(dropType); if (getDropList(dropType) == null)
if (dropList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType));
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

5
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@ -689,12 +689,13 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer) public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer)
{ {
final List<DropHolder> dropList = getDropList(dropType); if (getDropList(dropType) == null)
if (dropList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType));
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

5
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@ -689,12 +689,13 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer) public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer)
{ {
final List<DropHolder> dropList = getDropList(dropType); if (getDropList(dropType) == null)
if (dropList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType));
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

5
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@ -689,12 +689,13 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer) public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer)
{ {
final List<DropHolder> dropList = getDropList(dropType); if (getDropList(dropType) == null)
if (dropList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType));
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

9
L2J_Mobius_CT_2.6_HighFive/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@ -95,8 +95,8 @@ public final class L2NpcTemplate extends L2CharTemplate 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;
@ -546,12 +546,13 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer) public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer)
{ {
final List<DropHolder> dropList = getDropList(dropType); if (getDropList(dropType) == null)
if (dropList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType));
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);

5
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/actor/templates/L2NpcTemplate.java
View File

@ -689,12 +689,13 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer) public Collection<ItemHolder> calculateDrops(DropType dropType, L2Character victim, L2Character killer)
{ {
final List<DropHolder> dropList = getDropList(dropType); if (getDropList(dropType) == null)
if (dropList == null)
{ {
return null; return null;
} }
final List<DropHolder> dropList = new ArrayList<>(getDropList(dropType));
// randomize drop order // randomize drop order
Collections.shuffle(dropList); Collections.shuffle(dropList);