Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2025-02-19 05:01:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Reverted changes

Browse Source
This commit is contained in:
Auxilor 2020-10-15 20:14:36 +01:00
parent 274c77dd50
commit dbdda22170
2 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,12 +15,11 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.Repairable;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
public final class DecayCurse extends EcoEnchant implements EcoRunnable { public final class DecayCurse extends EcoEnchant implements EcoRunnable {
public DecayCurse() { public DecayCurse() {
@ -65,24 +64,29 @@ public final class DecayCurse extends EcoEnchant implements EcoRunnable {
private void refresh() { private void refresh() {
players.clear(); players.clear();
EcoEnchantsPlugin.getInstance().getServer().getOnlinePlayers().forEach(player -> { EcoEnchantsPlugin.getInstance().getServer().getOnlinePlayers().forEach(player -> {
if(Arrays.stream(player.getInventory().getContents()).parallel().anyMatch(item -> EnchantChecks.item(item, EcoEnchants.DECAY_CURSE))) if(Arrays.stream(player.getInventory().getContents()).parallel().anyMatch(item -> EnchantChecks.item(item, EcoEnchants.REPAIRING)))
players.add(player); players.add(player);
}); });
amount = EcoEnchants.DECAY_CURSE.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "damage"); amount = EcoEnchants.REPAIRING.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "damage");
} }
@Override @Override
public void run() { public void run() {
players.forEach((player -> { players.forEach((player -> {
List<ItemStack> toRepair = Arrays.stream(player.getInventory().getContents()) for(ItemStack item : player.getInventory().getContents()) {
.filter(ItemStack::hasItemMeta) if(!EnchantChecks.item(item, EcoEnchants.DECAY_CURSE)) continue;
.filter(item -> item.getItemMeta().hasEnchant(EcoEnchants.DECAY_CURSE))
.filter(item -> !player.getInventory().getItemInOffHand().equals(item)) if(!(item.getItemMeta() instanceof Repairable)) continue;
.filter(item -> !player.getInventory().getItemInMainHand().equals(item))
.filter(item -> !player.getItemOnCursor().equals(item)).collect(Collectors.toList()); if(player.getInventory().getItemInMainHand().equals(item)) continue;
toRepair.forEach(itemStack -> { if(player.getInventory().getItemInOffHand().equals(item)) continue;
DurabilityUtils.damageItemNoBreak(itemStack, amount, player); if(player.getItemOnCursor().equals(item)) continue;
});
int damage = EcoEnchants.DECAY_CURSE.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "damage");
DurabilityUtils.damageItemNoBreak(item, damage, player);
}
})); }));
} }

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

@ -15,12 +15,11 @@ import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerJoinEvent;
import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.Repairable;
import java.util.Arrays; import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
public final class Repairing extends EcoEnchant implements EcoRunnable { public final class Repairing extends EcoEnchant implements EcoRunnable {
public Repairing() { public Repairing() {
@ -73,17 +72,22 @@ public final class Repairing extends EcoEnchant implements EcoRunnable {
@Override @Override
public void run() { public void run() {
players.forEach((player -> { players.forEach((player -> {
List<ItemStack> toRepair = Arrays.stream(player.getInventory().getContents()) for(ItemStack item : player.getInventory().getContents()) {
.filter(ItemStack::hasItemMeta) if(!EnchantChecks.item(item, EcoEnchants.REPAIRING)) continue;
.filter(item -> item.getItemMeta().hasEnchant(EcoEnchants.REPAIRING))
.filter(item -> !player.getInventory().getItemInOffHand().equals(item)) if(!(item.getItemMeta() instanceof Repairable)) continue;
.filter(item -> !player.getInventory().getItemInMainHand().equals(item))
.filter(item -> !player.getItemOnCursor().equals(item)).collect(Collectors.toList()); if(player.getInventory().getItemInMainHand().equals(item)) continue;
toRepair.forEach(item -> { if(player.getInventory().getItemInOffHand().equals(item)) continue;
if(player.getItemOnCursor().equals(item)) continue;
int level = EnchantChecks.getItemLevel(item, EcoEnchants.REPAIRING); int level = EnchantChecks.getItemLevel(item, EcoEnchants.REPAIRING);
int multiplier = EcoEnchants.REPAIRING.getConfig().getInt(EcoEnchants.CONFIG_LOCATION + "multiplier");
int repairAmount = level * multiplier; int repairAmount = level * multiplier;
DurabilityUtils.repairItem(item, repairAmount); DurabilityUtils.repairItem(item, repairAmount);
}); }
})); }));
} }