minecraft/Essentials
1
0
Fork 0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-14 02:24:16 +02:00
Code Issues Releases Wiki Activity

Look out for nulls.

Browse Source
This commit is contained in:
KHobbits
2012-09-08 18:41:21 +01:00
parent 8e885a3a6e
commit ce50e1448b
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Essentials/src/com/earth2me/essentials/ItemDb.java
View File

@@ -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);

8
Essentials/src/com/earth2me/essentials/commands/Commanditemdb.java
View File

@@ -37,7 +37,7 @@ public class Commanditemdb extends EssentialsCommand
itemStack = ess.getItemDb().get(args[0]); itemStack = ess.getItemDb().get(args[0]);
} }
sender.sendMessage(_("itemType", itemStack.getType().toString(), itemStack.getTypeId() + ":" + Integer.toString(itemStack.getDurability()))); sender.sendMessage(_("itemType", itemStack.getType().toString(), itemStack.getTypeId() + ":" + Integer.toString(itemStack.getDurability())));
if (itemHeld && itemStack.getType() != Material.AIR) if (itemHeld && itemStack.getType() != Material.AIR)
{ {
int maxuses = itemStack.getType().getMaxDurability(); int maxuses = itemStack.getType().getMaxDurability();
@@ -47,6 +47,10 @@ public class Commanditemdb extends EssentialsCommand
sender.sendMessage(_("durability", Integer.toString(durability))); sender.sendMessage(_("durability", Integer.toString(durability)));
} }
} }
sender.sendMessage(_("itemNames", ess.getItemDb().names(itemStack))); final String itemNameList = ess.getItemDb().names(itemStack);
if (itemNameList != null)
{
sender.sendMessage(_("itemNames", ess.getItemDb().names(itemStack)));
}
} }
} }