Upstream/UltimateStacker
1
0
Fork 0
mirror of https://github.com/songoda/UltimateStacker.git synced 2024-09-27 06:02:45 +02:00
Code Issues Projects Releases Wiki Activity

Fix witch lootable

Browse Source
This commit is contained in:
ceze88 2023-10-09 17:43:32 +02:00
parent 95ce5bb8c2
commit 084d2c8348
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
UltimateStacker-Plugin/src/main/java/com.craftaro.ultimatestacker/lootables/LootablesManager.java
View File

@ -126,9 +126,9 @@ public class LootablesManager {
boolean isCharged = entity instanceof Creeper && ((Creeper) entity).isPowered();
//Run main loot
for (Loot loot : lootable.getRegisteredLoot().stream().filter(loot -> loot.getMaterial() != null).collect(Collectors.toList())) {
for (Loot loot : lootable.getRegisteredLoot()) {
if (loot.isRequireCharged() && !isCharged) continue;
if (loot.getOnlyDropFor().size() != 0 && loot.getOnlyDropFor().stream().noneMatch(type -> entity.getKiller() != null && type == entity.getKiller().getType())) continue;
if (!loot.getOnlyDropFor().isEmpty() && loot.getOnlyDropFor().stream().noneMatch(type -> entity.getKiller() != null && type == entity.getKiller().getType())) continue;
int finalLooting = loot.isAllowLootingEnchant() ? looting : 0;
long max = (long) (((long) (loot.getMax() + finalLooting) * times) * (loot.getChance()/100 + (loot.isAllowLootingEnchant() ? extraChance : 0)));
@ -136,7 +136,7 @@ public class LootablesManager {
long amount = ThreadLocalRandom.current().nextLong((max - min) + 1) + min;
if (amount > 0) {
if (loot.getMaterial() != null && amount > 0) {
ItemStack item = entity.getFireTicks() > 0
? loot.getBurnedMaterial() != null ? loot.getBurnedMaterial().parseItem() : loot.getMaterial().parseItem()
: loot.getMaterial().parseItem();
@ -153,6 +153,7 @@ public class LootablesManager {
toDrop.add(new Drop(item));
}
//Run child loot //TODO: remove duplicated code
for (Loot child : loot.getChildLoot()) {
if (child.isRequireCharged() && !isCharged) continue;