mirror of
https://github.com/essentials/Essentials.git
synced 2025-08-13 18:14:38 +02:00
Look out for nulls.
This commit is contained in:
@@ -139,6 +139,14 @@ public class ItemDb implements IConf, IItemDb
|
|||||||
{
|
{
|
||||||
ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
|
ItemData itemData = new ItemData(item.getTypeId(), item.getDurability());
|
||||||
List<String> nameList = names.get(itemData);
|
List<String> nameList = names.get(itemData);
|
||||||
|
if (nameList == null) {
|
||||||
|
itemData = new ItemData(item.getTypeId(), (short) 0);
|
||||||
|
nameList = names.get(itemData);
|
||||||
|
if (nameList == null) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (nameList.size() > 15)
|
if (nameList.size() > 15)
|
||||||
{
|
{
|
||||||
nameList = nameList.subList(0, 14);
|
nameList = nameList.subList(0, 14);
|
||||||
|
@@ -47,6 +47,10 @@ public class Commanditemdb extends EssentialsCommand
|
|||||||
sender.sendMessage(_("durability", Integer.toString(durability)));
|
sender.sendMessage(_("durability", Integer.toString(durability)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
final String itemNameList = ess.getItemDb().names(itemStack);
|
||||||
|
if (itemNameList != null)
|
||||||
|
{
|
||||||
sender.sendMessage(_("itemNames", ess.getItemDb().names(itemStack)));
|
sender.sendMessage(_("itemNames", ess.getItemDb().names(itemStack)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
Reference in New Issue
Block a user