Upstream
/
ChestShop-3
mirror of https://github.com/ChestShop-authors/ChestShop-3.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Protection from NPE

This commit is contained in:
Acrobot 2012-11-04 21:09:52 +01:00
parent 1e57726b60
commit 028a18179c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
com/Acrobot/ChestShop/Listeners/Block/SignChange.java
View File

@ -221,8 +221,9 @@ public class SignChange implements Listener {
}
String longItemName = MaterialUtil.getName(item, true);
ItemStack formattedItem = MaterialUtil.getItem(longItemName + data);
if (longItemName.length() < (15 - data.length()) && MaterialUtil.equals(MaterialUtil.getItem(longItemName + data), item)) {
if (longItemName.length() < (15 - data.length()) && formattedItem != null && MaterialUtil.equals(formattedItem, item)) {
return StringUtil.capitalizeFirstLetter(longItemName + data);
}
@ -233,7 +234,7 @@ public class SignChange implements Listener {
formatted = formatted.substring(0, (15 - data.length()));
}
ItemStack formattedItem = MaterialUtil.getItem(formatted);
formattedItem = MaterialUtil.getItem(formatted);
if (formattedItem == null || formattedItem.getType() != item.getType()) {
formatted = String.valueOf(item.getTypeId());