Skip to content
This repository was archived by the owner on Dec 5, 2021. It is now read-only.

Commit 73344fe

Browse files
committed
Fix null pointer
Former-commit-id: 3ac9166
1 parent ad5fabe commit 73344fe

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/main/java/org/maxgamer/quickshop/Util/MsgUtil.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,12 @@ public static void loadItemi18n() {
107107
}
108108
public static String getItemi18n(String ItemBukkitName) {
109109
ItemBukkitName = ItemBukkitName.trim().replaceAll(" ", "_").toUpperCase(Locale.ROOT);
110-
String Itemname_i18n = itemi18n.getString("itemi18n."+ItemBukkitName).trim();
110+
String Itemname_i18n = null;
111+
try {
112+
Itemname_i18n = itemi18n.getString("itemi18n."+ItemBukkitName).trim().replaceAll(" ", "_");
113+
}catch (Exception e) {
114+
Itemname_i18n = null;
115+
}
111116
if(ItemBukkitName==null) {
112117
return "";
113118
}

src/main/java/org/maxgamer/quickshop/Util/Util.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,7 +347,7 @@ public static String getNameForSign(ItemStack itemStack) {
347347
ItemStack is = itemStack.clone();
348348
is.setAmount(1);
349349

350-
String name = MsgUtil.getItemi18n(itemStack.getType().name());
350+
String name = MsgUtil.getItemi18n(itemStack.getType().name()).trim();
351351

352352
String[] nameParts = name.split("_");
353353
if (nameParts.length==1) {

0 commit comments

Comments
 (0)