Upstream/ChestShop-3
1
0
Fork 0
mirror of https://github.com/ChestShop-authors/ChestShop-3.git synced 2025-01-10 09:07:39 +01:00
Code Issues Projects Releases Wiki Activity

Restore compatibility with 1.8

Browse Source 
Fixes #9
This commit is contained in:
Dan Mulloy 2016-09-22 11:57:49 -04:00
parent e186635484
commit 24df17fde2
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/main/java/com/Acrobot/Breeze/Utils/InventoryUtil.java
View File

@ -12,6 +12,21 @@ import org.bukkit.inventory.ItemStack;
* @author Acrobot * @author Acrobot
*/ */
public class InventoryUtil { public class InventoryUtil {
private static Boolean legacyContents = null;
private static ItemStack[] getStorageContents(Inventory inventory) {
if (legacyContents == null) {
try {
inventory.getStorageContents();
legacyContents = false;
} catch (NoSuchMethodError e) {
legacyContents = true;
}
}
return legacyContents ? inventory.getContents() : inventory.getStorageContents();
}
/** /**
* Returns the amount of the item inside the inventory * Returns the amount of the item inside the inventory
* *
@ -49,7 +64,7 @@ public class InventoryUtil {
* @return Is the inventory empty? * @return Is the inventory empty?
*/ */
public static boolean isEmpty(Inventory inventory) { public static boolean isEmpty(Inventory inventory) {
for (ItemStack stack : inventory.getStorageContents()) { for (ItemStack stack : getStorageContents(inventory)) {
if (!MaterialUtil.isEmpty(stack)) { if (!MaterialUtil.isEmpty(stack)) {
return false; return false;
} }
@ -89,7 +104,7 @@ public class InventoryUtil {
return true; return true;
} }
for (ItemStack iStack : inventory.getStorageContents()) { for (ItemStack iStack : getStorageContents(inventory)) {
if (left <= 0) { if (left <= 0) {
return true; return true;
} }
@ -155,7 +170,7 @@ public class InventoryUtil {
// Don't use the armor slots or extra slots // Don't use the armor slots or extra slots
private static int effectiveSize(Inventory inventory) private static int effectiveSize(Inventory inventory)
{ {
return inventory.getStorageContents().length; return getStorageContents(inventory).length;
} }
/** /**