Upstream/mmoitems
1
0
Fork 0
mirror of https://gitlab.com/phoenix-dvpmt/mmoitems.git synced 2024-12-31 06:07:34 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enchantments data is now correctly read from Enchanted Books (that store enchantments in a different format internally, to prevent for example a Smite V enchanted book from dealing +12.5dmg against zombies in vanilla mc)

Browse Source
This commit is contained in:
Gunging 2021-12-07 13:22:45 -06:00
parent 762cabad07
commit c026535257
1 changed files with 32 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/Indyuce/mmoitems/stat/Enchants.java
View File

@ -36,6 +36,7 @@ import org.bukkit.event.inventory.InventoryAction;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta;
import org.bukkit.inventory.meta.ItemMeta;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@ -121,11 +122,32 @@ public class Enchants extends ItemStat implements Upgradable {
// Create enchant data from this items' enchantments
EnchantListData enchants = new EnchantListData();
// For each enchantment
for (Enchantment enchant : mmoitem.getNBT().getItem().getItemMeta().getEnchants().keySet()) {
// Get the Item Meta
ItemStack item = mmoitem.getNBT().getItem();
if (item.hasItemMeta()) {
// Add Level
enchants.addEnchant(enchant, mmoitem.getNBT().getItem().getItemMeta().getEnchantLevel(enchant));
// Finally, item meta
ItemMeta itemMeta = item.getItemMeta();
if (itemMeta != null) {
// For each enchantment, in the usual way
for (Enchantment enchant : itemMeta.getEnchants().keySet()) {
// Add Level
enchants.addEnchant(enchant, itemMeta.getEnchantLevel(enchant));
}
// For each enchantment 'stored' in the item
if (itemMeta instanceof EnchantmentStorageMeta) {
// For each enchantment
for (Enchantment enchant : ((EnchantmentStorageMeta) itemMeta).getStoredEnchants().keySet()) {
// Add Level
enchants.addEnchant(enchant, ((EnchantmentStorageMeta) itemMeta).getStoredEnchantLevel(enchant));
}
}
}
}
// Recognize the Stat Data
@ -249,10 +271,13 @@ public class Enchants extends ItemStat implements Upgradable {
int lvl = enchants.getLevel(enchant);
// If it's an enchanted item, has to be registered as a stored enchant instead
if (item.getItemStack().getType() == Material.ENCHANTED_BOOK)
if (item.getItemStack().getType() == Material.ENCHANTED_BOOK) {
// Vanilla enchanted books expect this behaviour from enchants I guess
((EnchantmentStorageMeta) item.getMeta()).addStoredEnchant(enchant, lvl, true);
else
item.getMeta().addEnchant(enchant, lvl, true);
// Add normally
} else { item.getMeta().addEnchant(enchant, lvl, true); }
// Handle custom enchant
for (EnchantPlugin enchantPlugin : MMOItems.plugin.getEnchantPlugins())