Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-17 21:02:20 +01:00
Code Issues Projects Releases Wiki Activity

Fixed NPE when the ItemParser returns null when the locale banner is an invalid String or does not exist

Browse Source
This commit is contained in:
Florian CUNY 2018-07-03 11:19:48 +02:00
parent 693625ab9a
commit 0cb21d8468
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/us/tastybento/bskyblock/panels/LanguagePanel.java
View File

@ -2,6 +2,8 @@ package us.tastybento.bskyblock.panels;
import java.util.Locale; import java.util.Locale;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import us.tastybento.bskyblock.BSkyBlock; import us.tastybento.bskyblock.BSkyBlock;
import us.tastybento.bskyblock.api.panels.builders.PanelBuilder; import us.tastybento.bskyblock.api.panels.builders.PanelBuilder;
import us.tastybento.bskyblock.api.panels.builders.PanelItemBuilder; import us.tastybento.bskyblock.api.panels.builders.PanelItemBuilder;
@ -23,8 +25,16 @@ public class LanguagePanel {
.name(user.getTranslation("language.panel-title")); .name(user.getTranslation("language.panel-title"));
for (Locale locale : BSkyBlock.getInstance().getLocalesManager().getAvailableLocales(true)) { for (Locale locale : BSkyBlock.getInstance().getLocalesManager().getAvailableLocales(true)) {
PanelItemBuilder localeIcon = new PanelItemBuilder().icon(BSkyBlock.getInstance().getLocalesManager().getLanguages().get(locale).getBanner()) PanelItemBuilder localeIcon = new PanelItemBuilder();
.name(fancyLocaleDisplayName(user, locale))
ItemStack localeBanner = BSkyBlock.getInstance().getLocalesManager().getLanguages().get(locale).getBanner();
if (localeBanner != null) {
localeIcon.icon(localeBanner);
} else {
localeIcon.icon(new ItemStack(Material.BANNER, 1)); // Set to a blank banner.
}
localeIcon.name(fancyLocaleDisplayName(user, locale))
.clickHandler((panel, u, click, slot) -> { .clickHandler((panel, u, click, slot) -> {
BSkyBlock.getInstance().getPlayers().setLocale(u.getUniqueId(), locale.toLanguageTag()); BSkyBlock.getInstance().getPlayers().setLocale(u.getUniqueId(), locale.toLanguageTag());
u.sendMessage("language.edited", "[lang]", fancyLocaleDisplayName(u, locale)); u.sendMessage("language.edited", "[lang]", fancyLocaleDisplayName(u, locale));

4
src/main/java/us/tastybento/bskyblock/util/ItemParser.java
View File

@ -147,10 +147,10 @@ public class ItemParser {
return result; return result;
} else { } else {
return new ItemStack(Material.BANNER, 1); // Return a blank banner return null;
} }
} catch (Exception e) { } catch (Exception e) {
return new ItemStack(Material.BANNER, 1); // Return a blank banner return null;
} }
} }
} }