diff options
| -rw-r--r-- | src/main/java/kubatech/loaders/MobRecipeLoader.java | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/main/java/kubatech/loaders/MobRecipeLoader.java b/src/main/java/kubatech/loaders/MobRecipeLoader.java index a338311a87..72dc0f6c0b 100644 --- a/src/main/java/kubatech/loaders/MobRecipeLoader.java +++ b/src/main/java/kubatech/loaders/MobRecipeLoader.java @@ -209,10 +209,7 @@ public class MobRecipeLoader { mOutputs = (ArrayList<MobDrop>) outputs.clone(); int maxdamagechance = 0; - for (Iterator<MobDrop> iterator = mOutputs.iterator(); iterator.hasNext(); ) { - MobDrop o = iterator.next(); - if (o.damages != null) for (int v : o.damages.values()) maxdamagechance += v; - } + for (MobDrop o : mOutputs) if (o.damages != null) for (int v : o.damages.values()) maxdamagechance += v; mMaxDamageChance = maxdamagechance; maxEntityHealth = e.getMaxHealth(); mDuration = Math.max(MOB_SPAWN_INTERVAL, (int) ((maxEntityHealth / DIAMOND_SPIKES_DAMAGE) * 10d)); @@ -222,14 +219,7 @@ public class MobRecipeLoader { public void refresh() { int maxdamagechance = 0; - for (Iterator<MobDrop> iterator = mOutputs.iterator(); iterator.hasNext(); ) { - MobDrop o = iterator.next(); - if (o.playerOnly) { - iterator.remove(); - continue; - } - if (o.damages != null) for (int v : o.damages.values()) maxdamagechance += v; - } + for (MobDrop o : mOutputs) if (o.damages != null) for (int v : o.damages.values()) maxdamagechance += v; mMaxDamageChance = maxdamagechance; } @@ -244,7 +234,10 @@ public class MobRecipeLoader { ArrayList<ItemStack> stacks = new ArrayList<>(mOutputs.size()); for (MobDrop o : mOutputs) { int chance = o.chance; - if (o.playerOnly) chance /= 10; + if (o.playerOnly) { + chance /= 10; + if (chance < 1) chance = 1; + } int amount = o.stack.stackSize; if (o.lootable && lootinglevel > 0) { chance += lootinglevel * 5000; @@ -1183,8 +1176,7 @@ public class MobRecipeLoader { recipe.mOutputs.removeIf(removal::isMatching); } drops.addAll(override.additions); - recipe.mOutputs.addAll( - override.additions.stream().filter(d -> !d.playerOnly).collect(Collectors.toList())); + recipe.mOutputs.addAll(override.additions); LoadConfigPacket.instance.mobsOverrides.put(k, override); } recipe.refresh(); @@ -1230,8 +1222,7 @@ public class MobRecipeLoader { recipe.mOutputs.removeIf(removal::isMatching); } drops.addAll(override.additions); - recipe.mOutputs.addAll( - override.additions.stream().filter(d -> !d.playerOnly).collect(Collectors.toList())); + recipe.mOutputs.addAll(override.additions); drops.sort(Comparator.comparing(d -> d.type)); // Fix GUI } recipe.refresh(); |