Repo-Mirror/EcoEnchants
9
0
Fork 0
Code Issues Releases 1 Activity

Hotfix for decay curse and repairing

Browse Source
This commit is contained in:
Auxilor
2020-10-15 20:09:19 +01:00
parent afe5a44e76
commit 274c77dd50
2 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/curse/DecayCurse.java
View File

@@ -18,7 +18,9 @@ import org.bukkit.inventory.ItemStack;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public final class DecayCurse extends EcoEnchant implements EcoRunnable {
public DecayCurse() {
@@ -72,16 +74,15 @@ public final class DecayCurse extends EcoEnchant implements EcoRunnable {
@Override
public void run() {
players.forEach((player -> {
Arrays.stream(player.getInventory().getContents())
List<ItemStack> toRepair = Arrays.stream(player.getInventory().getContents())
.filter(ItemStack::hasItemMeta)
.filter(item -> item.getItemMeta().hasEnchant(EcoEnchants.DECAY_CURSE))
.filter(item -> player.getInventory().getItemInOffHand().equals(item))
.filter(item -> player.getInventory().getItemInMainHand().equals(item))
.filter(item -> player.getItemOnCursor().equals(item))
.forEach(item -> {
DurabilityUtils.repairItem(item, amount);
}
);
.filter(item -> !player.getInventory().getItemInOffHand().equals(item))
.filter(item -> !player.getInventory().getItemInMainHand().equals(item))
.filter(item -> !player.getItemOnCursor().equals(item)).collect(Collectors.toList());
toRepair.forEach(itemStack -> {
DurabilityUtils.damageItemNoBreak(itemStack, amount, player);
});
}));
}

21
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/special/Repairing.java
View File

@@ -18,7 +18,9 @@ import org.bukkit.inventory.ItemStack;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public final class Repairing extends EcoEnchant implements EcoRunnable {
public Repairing() {
@@ -71,18 +73,17 @@ public final class Repairing extends EcoEnchant implements EcoRunnable {
@Override
public void run() {
players.forEach((player -> {
Arrays.stream(player.getInventory().getContents())
List<ItemStack> toRepair = Arrays.stream(player.getInventory().getContents())
.filter(ItemStack::hasItemMeta)
.filter(item -> item.getItemMeta().hasEnchant(EcoEnchants.REPAIRING))
.filter(item -> player.getInventory().getItemInOffHand().equals(item))
.filter(item -> player.getInventory().getItemInMainHand().equals(item))
.filter(item -> player.getItemOnCursor().equals(item))
.forEach(item -> {
int level = EnchantChecks.getItemLevel(item, EcoEnchants.REPAIRING);
int repairAmount = level * multiplier;
DurabilityUtils.repairItem(item, repairAmount);
}
);
.filter(item -> !player.getInventory().getItemInOffHand().equals(item))
.filter(item -> !player.getInventory().getItemInMainHand().equals(item))
.filter(item -> !player.getItemOnCursor().equals(item)).collect(Collectors.toList());
toRepair.forEach(item -> {
int level = EnchantChecks.getItemLevel(item, EcoEnchants.REPAIRING);
int repairAmount = level * multiplier;
DurabilityUtils.repairItem(item, repairAmount);
});
}));
}