Fixed 2 NPE errors.
This commit is contained in:
parent
56eec348de
commit
0a9e4d48b5
@ -183,9 +183,11 @@ public class InventoryHandler {
|
|||||||
arenaNameNote_IM.setLore(lores);
|
arenaNameNote_IM.setLore(lores);
|
||||||
arenaNameNote.setItemMeta(arenaNameNote_IM);
|
arenaNameNote.setItemMeta(arenaNameNote_IM);
|
||||||
panel.setItem(0, arenaNameNote);
|
panel.setItem(0, arenaNameNote);
|
||||||
|
if (arena.disguiseBlocks != null) {
|
||||||
for (int i = arena.disguiseBlocks.size(); i > 0; i = i - 1) {
|
for (int i = arena.disguiseBlocks.size(); i > 0; i = i - 1) {
|
||||||
panel.setItem(i, arena.disguiseBlocks.get(i - 1));
|
panel.setItem(i, arena.disguiseBlocks.get(i - 1));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
player.openInventory(panel);
|
player.openInventory(panel);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -28,11 +28,13 @@ public class OnInventoryClickEvent implements Listener {
|
|||||||
if (inv.getType().equals(InventoryType.CHEST)) {
|
if (inv.getType().equals(InventoryType.CHEST)) {
|
||||||
if (inv.getName().startsWith("\u00A7r")) {
|
if (inv.getName().startsWith("\u00A7r")) {
|
||||||
if (inv.getName().contains("DisguiseBlocks")) {
|
if (inv.getName().contains("DisguiseBlocks")) {
|
||||||
|
if (event.getCurrentItem() != null) {
|
||||||
if (!event.getCurrentItem().getType().isBlock()) {
|
if (!event.getCurrentItem().getType().isBlock()) {
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
MessageM.sendFMessage(player,
|
MessageM.sendFMessage(player,
|
||||||
ConfigC.error_setNotABlock, true);
|
ConfigC.error_setNotABlock, true);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user