diff options
Diffstat (limited to 'bukkit')
| -rw-r--r-- | bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java | 5 | ||||
| -rw-r--r-- | bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java index d00d2af3..dedaf209 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/CategoryQMenu.java @@ -17,6 +17,7 @@ import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -75,9 +76,7 @@ public class CategoryQMenu implements QMenu { slot++; } - for (Integer integer : menuElements.keySet()) { - if (integer + 1 > maxElement) maxElement = integer + 1; - } + maxElement = menuElements.size() > 0 ? Collections.max(menuElements.keySet()) + 1 : 0; // stop bottom row of pg1 going to pg2 if entire inv contents would fit on pg1 perfectly if (maxElement > 45 && maxElement <= 54) { diff --git a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java index 25d49b91..e6d4356f 100644 --- a/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java +++ b/bukkit/src/main/java/com/leonardobishop/quests/bukkit/menu/QuestQMenu.java @@ -108,9 +108,7 @@ public class QuestQMenu implements QMenu { slot++; } - for (Integer integer : menuElements.keySet()) { - if (integer + 1 > maxElement) maxElement = integer + 1; - } + maxElement = menuElements.size() > 0 ? Collections.max(menuElements.keySet()) + 1 : 0; } @Override |