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

Made aggressive conversions only affect block inventories

Browse Source
This commit is contained in:
Auxilor 2021-03-03 14:21:13 +00:00
parent 242882d736
commit 200e60467f
1 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
eco-core/core-plugin/src/main/java/com/willfp/ecoenchants/enchantments/util/ItemConversions.java
View File

@ -13,6 +13,8 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryOpenEvent; import org.bukkit.event.inventory.InventoryOpenEvent;
import org.bukkit.event.player.PlayerItemHeldEvent; import org.bukkit.event.player.PlayerItemHeldEvent;
import org.bukkit.inventory.BlockInventoryHolder;
import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemFlag; import org.bukkit.inventory.ItemFlag;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.EnchantmentStorageMeta;
@ -56,7 +58,7 @@ public class ItemConversions extends PluginDependent implements Listener {
} }
/** /**
* On player hold item. * On player open inventory.
* <p> * <p>
* Listener for lore conversion. * Listener for lore conversion.
* *
@ -68,7 +70,17 @@ public class ItemConversions extends PluginDependent implements Listener {
return; return;
} }
for (ItemStack itemStack : event.getInventory().getContents()) { Inventory inventory = event.getInventory();
if (inventory.getHolder() == null) {
return;
}
if (!(inventory.getHolder() instanceof BlockInventoryHolder)) {
return;
}
for (ItemStack itemStack : inventory.getContents()) {
convertLore(itemStack); convertLore(itemStack);
} }
} }
@ -161,7 +173,7 @@ public class ItemConversions extends PluginDependent implements Listener {
} }
/** /**
* On player hold item. * On player open inventory.
* <p> * <p>
* Listener for hide fixer. * Listener for hide fixer.
* *
@ -173,7 +185,17 @@ public class ItemConversions extends PluginDependent implements Listener {
return; return;
} }
for (ItemStack itemStack : event.getInventory().getContents()) { Inventory inventory = event.getInventory();
if (inventory.getHolder() == null) {
return;
}
if (!(inventory.getHolder() instanceof BlockInventoryHolder)) {
return;
}
for (ItemStack itemStack : inventory.getContents()) {
hideFixItem(itemStack); hideFixItem(itemStack);
} }
} }