Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2024-07-01 09:14:51 +02:00
Code Issues Projects Releases Wiki Activity

Prevent to set null as icon in PanelItems. (#957)

Browse Source 
Add protection code from null types of icons in PanelItemBuilder.
Relates to https://github.com/BentoBoxWorld/BSkyBlock/issues/203
This commit is contained in:
BONNe 2019-09-25 13:06:08 +03:00 committed by Florian CUNY
parent 2e8a3e2abb
commit 6b42d07185
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/world/bentobox/bentobox/api/panels/builders/PanelItemBuilder.java
View File

@ -8,6 +8,7 @@ import java.util.List;
import org.bukkit.ChatColor;
import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
import org.eclipse.jdt.annotation.NonNull;
import org.eclipse.jdt.annotation.Nullable;
import world.bentobox.bentobox.api.panels.PanelItem;
@ -22,13 +23,19 @@ public class PanelItemBuilder {
private boolean playerHead;
private boolean invisible;
public PanelItemBuilder icon(Material icon) {
this.icon = new ItemStack(icon);
/**
* Default icon if someone gives invalid material or item stack.
*/
private final static ItemStack DEFAULT_ICON = new ItemStack(Material.PAPER);
public PanelItemBuilder icon(@NonNull Material icon) {
this.icon = icon == null ? DEFAULT_ICON : new ItemStack(icon);
return this;
}
public PanelItemBuilder icon(ItemStack icon) {
this.icon = icon;
public PanelItemBuilder icon(@NonNull ItemStack icon) {
this.icon = icon == null ? DEFAULT_ICON : icon;
return this;
}