Upstream/EcoEnchants
1
0
Fork 0
mirror of https://github.com/Auxilor/EcoEnchants.git synced 2024-11-25 15:35:11 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimised armor checks

Browse Source
This commit is contained in:
Auxilor 2020-09-27 12:40:49 +01:00
parent 6d2f6dca84
commit 41498c4d88
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/EnchantChecks.java
View File

@ -183,6 +183,22 @@ public final class EnchantChecks {
return armorPoints.get();
}
public static Map<EcoEnchant, Integer> getEnchantsOnArmor(LivingEntity entity) {
if(entity.getEquipment() == null)
return new HashMap<>();
AtomicInteger armorPoints = new AtomicInteger(0);
List<ItemStack> armor = Arrays.asList(entity.getEquipment().getArmorContents());
Map<EcoEnchant, Integer> ecoEnchants = new HashMap<>();
armor.forEach((itemStack -> {
ecoEnchants.putAll(EnchantChecks.getEnchantsOnItem(itemStack));
}));
return ecoEnchants;
}
public static boolean helmet(LivingEntity entity, Enchantment enchantment) {
return getHelmetLevel(entity, enchantment) != 0;
}

19
Plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/WatcherTriggers.java
View File

@ -2,7 +2,6 @@ package com.willfp.ecoenchants.enchantments.util;
import com.google.common.collect.Sets;
import com.willfp.ecoenchants.EcoEnchantsPlugin;
import com.willfp.ecoenchants.enchantments.EcoEnchant;
import com.willfp.ecoenchants.enchantments.EcoEnchants;
import com.willfp.ecoenchants.events.armorequip.ArmorEquipEvent;
import com.willfp.ecoenchants.integrations.antigrief.AntigriefManager;
@ -102,13 +101,11 @@ public class WatcherTriggers implements Listener {
jumpVelocity = Float.parseFloat(df.format(jumpVelocity).replace(',', '.'));
if (event.getPlayer().getLocation().getBlock().getType() != Material.LADDER && prevPlayersOnGround.contains(player.getUniqueId())) {
if (!player.isOnGround() && Float.compare((float) player.getVelocity().getY(), jumpVelocity) == 0) {
EcoEnchants.getAll().forEach((enchant -> {
EnchantChecks.getEnchantsOnArmor(player).forEach((enchant, level) -> {
if(event.isCancelled()) return;
if(!enchant.isEnabled()) return;
int level = EnchantChecks.getArmorPoints(player, enchant);
if(level == 0) return;
enchant.onJump(player, level, event);
}));
});
}
}
}
@ -171,13 +168,11 @@ public class WatcherTriggers implements Listener {
LivingEntity victim = (LivingEntity) event.getEntity();
EcoEnchants.getAll().forEach((enchant -> {
EnchantChecks.getEnchantsOnArmor(victim).forEach((enchant, level) -> {
if(event.isCancelled()) return;
if(!enchant.isEnabled()) return;
int level = EnchantChecks.getArmorPoints(victim, enchant);
if(level == 0) return;
enchant.onFallDamage(victim, level, event);
}));
});
}
@EventHandler(ignoreCancelled = true)
@ -237,13 +232,11 @@ public class WatcherTriggers implements Listener {
LivingEntity victim = (LivingEntity) event.getEntity();
EcoEnchants.getAll().forEach((enchant -> {
EnchantChecks.getEnchantsOnArmor(victim).forEach((enchant, level) -> {
if(event.isCancelled()) return;
if(!enchant.isEnabled()) return;
int level = EnchantChecks.getArmorPoints(victim, enchant);
if(level == 0) return;
enchant.onDamageWearingArmor(victim, level, event);
}));
});
}
@EventHandler(ignoreCancelled = true)