From 93b6829e834cb375781ed62e8bd8ce2b6a77db70 Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Sat, 12 Apr 2025 19:14:13 +0200 Subject: [PATCH] Also fix AbstractHorse getSize and isEmpty --- .../inventory/CraftInventoryAbstractHorse.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java index 862ee8052..9cf561d5b 100644 --- a/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java +++ b/paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java @@ -50,12 +50,12 @@ public class CraftInventoryAbstractHorse extends CraftInventory implements Abstr @Override public int getSize() { - return this.getMainInventory().getContainerSize() + this.getArmorInventory().getContainerSize(); + return this.getMainInventory().getContainerSize() + this.getArmorInventory().getContainerSize() + this.getSaddleInventory().getContainerSize(); } @Override public boolean isEmpty() { - return this.getMainInventory().isEmpty() && this.getArmorInventory().isEmpty(); + return this.getMainInventory().isEmpty() && this.getArmorInventory().isEmpty() && this.getSaddleInventory().isEmpty(); } @Override @@ -116,8 +116,10 @@ public class CraftInventoryAbstractHorse extends CraftInventory implements Abstr if (index > HorseInventoryMenu.SLOT_BODY_ARMOR) { shiftedIndex--; } + if (index > HorseInventoryMenu.SLOT_SADDLE) { + shiftedIndex--; + } this.getMainInventory().setItem(shiftedIndex, CraftItemStack.asNMSCopy(item)); } } - // Paper end - combine both horse inventories }