twin/paper-mc
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-07-26 09:42:06 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix indices for horse inventories getItem

Browse Source 
If the index is shifted for slots after the saddle slot in the setter
then it should be in the getter to stay consistent.
This commit is contained in:
Lulu13022002
2025-06-11 18:47:00 +02:00
parent 87d0fdd89e
commit a38aeef6de
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java
View File

@@ -20,12 +20,12 @@ public class CraftInventoryAbstractHorse extends CraftInventory implements Abstr
@Override
public ItemStack getSaddle() {
return this.getItem(HorseInventoryMenu.SLOT_SADDLE); // Paper
return this.getItem(HorseInventoryMenu.SLOT_SADDLE);
}
@Override
public void setSaddle(ItemStack stack) {
this.setItem(HorseInventoryMenu.SLOT_SADDLE, stack); // Paper
this.setItem(HorseInventoryMenu.SLOT_SADDLE, stack);
}
public Container getMainInventory() {
@@ -88,14 +88,17 @@ public class CraftInventoryAbstractHorse extends CraftInventory implements Abstr
@Override
public ItemStack getItem(final int index) {
if (index == HorseInventoryMenu.SLOT_BODY_ARMOR) {
final net.minecraft.world.item.ItemStack item = this.getArmorInventory().getItem(0);
return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
} else if (index == HorseInventoryMenu.SLOT_SADDLE) {
if (index == HorseInventoryMenu.SLOT_SADDLE) {
final net.minecraft.world.item.ItemStack item = this.getSaddleInventory().getItem(0);
return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
} else if (index == HorseInventoryMenu.SLOT_BODY_ARMOR) {
final net.minecraft.world.item.ItemStack item = this.getArmorInventory().getItem(0);
return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
} else {
int shiftedIndex = index;
if (index > HorseInventoryMenu.SLOT_SADDLE) {
shiftedIndex--;
}
if (index > HorseInventoryMenu.SLOT_BODY_ARMOR) {
shiftedIndex--;
}
@@ -113,10 +116,10 @@ public class CraftInventoryAbstractHorse extends CraftInventory implements Abstr
this.getSaddleInventory().setItem(0, CraftItemStack.asNMSCopy(item));
} else {
int shiftedIndex = index;
if (index > HorseInventoryMenu.SLOT_BODY_ARMOR) {
if (index > HorseInventoryMenu.SLOT_SADDLE) {
shiftedIndex--;
}
if (index > HorseInventoryMenu.SLOT_SADDLE) {
if (index > HorseInventoryMenu.SLOT_BODY_ARMOR) {
shiftedIndex--;
}
this.getMainInventory().setItem(shiftedIndex, CraftItemStack.asNMSCopy(item));