Fix issue with selling written books (#1107)

Also improved the manual add method.

src/main/java/com/Acrobot/Breeze/Utils/InventoryUtil.java

@@ -1,12 +1,14 @@
 package com.Acrobot.Breeze.Utils;
 
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BookMeta;
 
 /**
  * @author Acrobot
@@ -82,7 +84,7 @@ public class InventoryUtil {
      */
     public static boolean hasItems(ItemStack[] items, Inventory inventory) {
         for (ItemStack item : items) {
-            if (!inventory.containsAtLeast(item, item.getAmount())) {
+            if (getAmount(item, inventory) < item.getAmount()) {
                 return false;
             }
         }
@@ -141,32 +143,27 @@ public class InventoryUtil {
             return add(item, inventory);
         }
 
+        return addManually(item, inventory, maxStackSize);
+    }
+
+    private static int addManually(ItemStack item, Inventory inventory, int maxStackSize) {
         int amountLeft = item.getAmount();
 
         for (int currentSlot = 0; currentSlot < effectiveSize(inventory) && amountLeft > 0; currentSlot++) {
             ItemStack currentItem = inventory.getItem(currentSlot);
-            ItemStack duplicate = item.clone();
 
             if (MaterialUtil.isEmpty(currentItem)) {
-                duplicate.setAmount(Math.min(amountLeft, maxStackSize));
+                currentItem.setAmount(Math.min(amountLeft, maxStackSize));
-                duplicate.addUnsafeEnchantments(item.getEnchantments());
 
-                amountLeft -= duplicate.getAmount();
+                amountLeft -= currentItem.getAmount();
-
-                inventory.setItem(currentSlot, duplicate);
             } else if (currentItem.getAmount() < maxStackSize && MaterialUtil.equals(currentItem, item)) {
-                int currentAmount = currentItem.getAmount();
+                int neededToAdd = Math.min(maxStackSize - currentItem.getAmount(), amountLeft);
-                int neededToAdd = Math.min(maxStackSize - currentAmount, amountLeft);
 
-                duplicate.setAmount(currentAmount + neededToAdd);
+                currentItem.setAmount(currentItem.getAmount() + neededToAdd);
-                duplicate.addUnsafeEnchantments(item.getEnchantments());
 
                 amountLeft -= neededToAdd;
-
-                inventory.setItem(currentSlot, duplicate);
             }
         }
-
         return amountLeft;
     }
 
@@ -186,6 +183,18 @@ public class InventoryUtil {
     public static int add(ItemStack item, Inventory inventory) {
         Map<Integer, ItemStack> leftovers = inventory.addItem(item.clone()); // item needs to be cloned as cb changes the amount of the stack size
 
+        if (!leftovers.isEmpty()) {
+            for (Iterator<ItemStack> iterator = leftovers.values().iterator(); iterator.hasNext(); ) {
+                ItemStack left = iterator.next();
+                int amountLeft = addManually(left, inventory, left.getMaxStackSize());
+                if (amountLeft == 0) {
+                    iterator.remove();
+                } else {
+                    left.setAmount(amountLeft);
+                }
+            }
+        }
+
         return countItems(leftovers);
     }
 
@@ -199,9 +208,35 @@ public class InventoryUtil {
     public static int remove(ItemStack item, Inventory inventory) {
         Map<Integer, ItemStack> leftovers = inventory.removeItem(item);
 
+        if (!leftovers.isEmpty()) {
+            for (Iterator<ItemStack> iterator = leftovers.values().iterator(); iterator.hasNext(); ) {
+                ItemStack left = iterator.next();
+                if (removeManually(left, inventory) == 0) {
+                    iterator.remove();
+                }
+            }
+        }
+
         return countItems(leftovers);
     }
 
+    private static int removeManually(ItemStack item, Inventory inventory) {
+        int amountLeft = item.getAmount();
+
+        for (int currentSlot = 0; currentSlot < effectiveSize(inventory) && amountLeft > 0; currentSlot++) {
+            ItemStack currentItem = inventory.getItem(currentSlot);
+
+            if (MaterialUtil.equals(currentItem, item)) {
+                int neededToRemove = Math.min(currentItem.getAmount(), amountLeft);
+
+                currentItem.setAmount(currentItem.getAmount() - neededToRemove);
+
+                amountLeft -= neededToRemove;
+            }
+        }
+        return amountLeft;
+    }
+
     /**
      * If items in arguments are similar, this function merges them into stacks of the same type
      *
@@ -252,11 +287,11 @@ public class InventoryUtil {
      * @param items Leftovers
      * @return Number of leftovers
      */
-    public static int countItems(Map<Integer, ?> items) {
+    public static int countItems(Map<Integer, ItemStack> items) {
         int totalLeft = 0;
 
-        for (int left : items.keySet()) {
+        for (ItemStack left : items.values()) {
-            totalLeft += left;
+            totalLeft += left.getAmount();
         }
 
         return totalLeft;

src/main/java/com/Acrobot/Breeze/Utils/MaterialUtil.java

@@ -10,6 +10,7 @@ import org.bukkit.Material;
 import org.bukkit.TreeSpecies;
 import org.bukkit.entity.EntityType;
 import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.BookMeta;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.*;
 
@@ -48,7 +49,20 @@ public class MaterialUtil {
      * @return Are they equal?
      */
     public static boolean equals(ItemStack one, ItemStack two) {
-        return one.isSimilar(two);
+        if (one == null || two == null) {
+            return one != two;
+        }
+        if (one.isSimilar(two)) {
+            return true;
+        }
+
+        // Special check for books as their pages might change when serialising (See SPIGOT-3206)
+        return one.getType() == two.getType()
+                && one.getDurability() == two.getDurability()
+                && one.getData().equals(two.getData())
+                && one.hasItemMeta() && two.hasItemMeta()
+                && one.getItemMeta() instanceof BookMeta && two.getItemMeta() instanceof BookMeta
+                && one.getItemMeta().serialize().equals(two.getItemMeta().serialize());
     }
 
     /**