Upstream/Essentials
1
0
Fork 0
mirror of https://github.com/EssentialsX/Essentials.git synced 2024-10-01 09:07:26 +02:00
Code Issues Projects Releases Wiki Activity

Use potion data when looking up items

Browse Source
This commit is contained in:
md678685 2018-09-01 15:48:14 +01:00
parent 102cb6d949
commit a89c97409b
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
nms/FlattenedProvider/src/net/ess3/nms/flattened/FlatItemDbProvider.java
View File

@ -7,6 +7,7 @@ import com.google.gson.JsonParser;
import net.ess3.nms.ItemDbProvider;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.inventory.meta.PotionMeta;
import org.bukkit.potion.PotionData;
@ -41,7 +42,7 @@ public class FlatItemDbProvider extends ItemDbProvider {
@Override
public String getPrimaryName(ItemStack item) {
ItemData itemData = new FlatItemData(null, item.getType(), null);
ItemData itemData = new FlatItemData(null, item.getType(), getPotionData(item));
for (Map.Entry<String, FlatItemData> entry : primaryNames.entrySet()) {
if (entry.getValue().equals(itemData)) {
@ -52,6 +53,15 @@ public class FlatItemDbProvider extends ItemDbProvider {
return null;
}
private PotionData getPotionData(ItemStack item) {
ItemMeta meta = item.getItemMeta();
if (meta instanceof PotionMeta) {
return ((PotionMeta) meta).getBasePotionData();
}
return null;
}
@Override
public List<String> getNames(ItemStack item) {
String primaryName = getPrimaryName(item);