sigonasr2/SigMinecraft
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Some Item Cube null fixes.

Browse Source
This commit is contained in:
sigonasr2 2013-11-19 14:08:44 -07:00
parent b315a5a3eb
commit e00f04bf30
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BankEconomyMod/src/me/kaZep/Base/Main.java
View File

@ -4722,7 +4722,7 @@ public void payDay(int time)
}
public boolean is_ItemCube(ItemStack item_cube) {
if (item_cube.hasItemMeta() && item_cube.getItemMeta().getLore()!=null) {
if (item_cube.hasItemMeta() && item_cube.getItemMeta().hasLore()) {
//Check to see if the Lore contains anything.
for (int i=0;i<item_cube.getItemMeta().getLore().size();i++) {
if (item_cube.getItemMeta().getLore().get(i).equalsIgnoreCase(ChatColor.AQUA+"Contains 9 item slots.")) {

4
BankEconomyMod/src/me/kaZep/Base/PlayerListener.java
View File

@ -9688,7 +9688,7 @@ implements Listener
}
if (event.getInventory().getType()==InventoryType.CRAFTING /*|| event.getInventory().getType()==InventoryType.CHEST*//*Buggy for some reason. We can't open chests in chests.*/) {
if (event.getCurrentItem()!=null) {
if ((event.getCurrentItem().getType()==Material.CHEST || event.getCurrentItem().getType()==Material.TRAPPED_CHEST || event.getCurrentItem().getType()==Material.ENDER_CHEST) && event.getClick()==ClickType.RIGHT && event.getCurrentItem().hasItemMeta()) {
if (isItemCube(event.getCurrentItem()) && event.getClick()==ClickType.RIGHT && event.getCurrentItem().hasItemMeta()) {
if (isItemCube(event.getCurrentItem())) {
//Only cancel the event and view the Item Cube if it actually is one.
viewItemCube(p, event.getCurrentItem());
@ -12182,7 +12182,7 @@ implements Listener
e.setCancelled(true);
return;
}
if (p.getItemInHand()!=null && (p.getItemInHand().getType()==Material.CHEST || p.getItemInHand().getType()==Material.TRAPPED_CHEST || p.getItemInHand().getType()==Material.ENDER_CHEST)) {
if (p.getItemInHand()!=null && isItemCube(p.getItemInHand())) {
viewItemCube(p, p.getItemInHand());
e.setCancelled(true);
return;