Repo-Mirror/EcoArmor
9
0
Fork 0
mirror of https://github.com/Auxilor/EcoArmor.git synced 2025-12-27 02:49:22 +00:00
Code Issues Releases 1 Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Auxilor
2021-12-05 20:33:37 +00:00
parent abb39fcac1 9637320c1e
commit efe8476788
2 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/commands/CommandGive.java
View File

@@ -170,17 +170,14 @@ public class CommandGive extends Subcommand {
}
}
if (tier == null) {
tier = Tiers.getDefaultTier();
}
for (ArmorSlot slot : slots) {
items.add(advanced ? set.getAdvancedItemStack(slot) : set.getItemStack(slot));
}
for (ItemStack item : new ArrayList<>(items)) {
Tier currTear = tier != null ? tier: set.getDefaultTier(ArmorSlot.getSlot(item));
items.remove(item);
ArmorUtils.setTier(item, tier);
ArmorUtils.setTier(item, currTear);
items.add(item);
}
}

13
eco-core/core-plugin/src/main/java/com/willfp/ecoarmor/sets/ArmorSet.java
View File

@@ -10,6 +10,7 @@ import com.willfp.eco.core.items.builder.ItemStackBuilder;
import com.willfp.eco.core.items.builder.LeatherArmorBuilder;
import com.willfp.eco.core.items.builder.SkullBuilder;
import com.willfp.eco.core.recipe.Recipes;
import com.willfp.ecoarmor.EcoArmorPlugin;
import com.willfp.ecoarmor.sets.meta.ArmorSlot;
import com.willfp.ecoarmor.sets.util.ArmorUtils;
import com.willfp.ecoarmor.upgrades.Tier;
@@ -343,6 +344,18 @@ public class ArmorSet {
return advancedItems.get(slot);
}
/**
* Get default tier for slot.
*
* @param slot The slot.
* @return The tier.
*/
public Tier getDefaultTier(@Nullable final ArmorSlot slot) {
if (slot == null) return Tiers.getDefaultTier();
Tier tier = Tiers.getByName(this.config.getSubsection(slot.name().toLowerCase()).getString("defaultTier"));
return tier != null ? tier: Tiers.getDefaultTier();
}
@Override
public boolean equals(final Object o) {
if (this == o) {