Removed stream usage from ItemCrystallizationData.

This commit is contained in:
MobiusDevelopment
2023-01-08 14:01:22 +00:00
parent e7193f5f11
commit 102aa97320
52 changed files with 416 additions and 130 deletions

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }

View File

@@ -204,21 +204,32 @@ public class ItemCrystallizationData implements IXmlReader
public List<ItemChanceHolder> getCrystallizationRewards(Item item) public List<ItemChanceHolder> getCrystallizationRewards(Item item)
{ {
final List<ItemChanceHolder> result = new ArrayList<>(); final List<ItemChanceHolder> result = new ArrayList<>();
final int crystalItemId = item.getTemplate().getCrystalItemId();
final CrystallizationDataHolder data = getCrystallizationData(item.getId()); final CrystallizationDataHolder data = getCrystallizationData(item.getId());
if (data != null) if (data != null)
{ {
// If there are no crystals on the template, add such. // If there are no crystals on the template, add such.
if (data.getItems().stream().noneMatch(i -> i.getId() == item.getTemplate().getCrystalItemId())) boolean found = false;
final List<ItemChanceHolder> items = data.getItems();
for (ItemChanceHolder holder : items)
{ {
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); if (holder.getId() == crystalItemId)
{
found = true;
break;
}
}
if (!found)
{
result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
result.addAll(data.getItems()); result.addAll(items);
} }
else else
{ {
// Add basic crystal reward. // Add basic crystal reward.
result.add(new ItemChanceHolder(item.getTemplate().getCrystalItemId(), 100, item.getCrystalCount())); result.add(new ItemChanceHolder(crystalItemId, 100, item.getCrystalCount()));
} }
return result; return result;

View File

@@ -40,6 +40,6 @@ public class CrystallizationDataHolder
public List<ItemChanceHolder> getItems() public List<ItemChanceHolder> getItems()
{ {
return Collections.unmodifiableList(_items); return _items;
} }
} }