mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-16 07:35:35 +01:00
Fix horse inventories (#11028)
This commit is contained in:
Jake Potrebic
GitHub
parent
4d20922b79
commit
2fa5e0e0df
173
patches/server/1035-fix-horse-inventories.patch
Normal file
173
patches/server/1035-fix-horse-inventories.patch
Normal file
@ -0,0 +1,173 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Jake Potrebic <jake.m.potrebic@gmail.com>
|
||||
Date: Sat, 6 Jul 2024 13:57:10 -0700
|
||||
Subject: [PATCH] fix horse inventories
|
||||
|
||||
Horse inventories now combine 2 inventories (like
|
||||
result inventories).
|
||||
|
||||
== AT ==
|
||||
public net/minecraft/world/inventory/HorseInventoryMenu SLOT_BODY_ARMOR
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
||||
index 9bcc0931510607b8fbd01233e2b3c346369b214d..467693a60786688b753cebac3b0a88898e332eee 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
|
||||
@@ -112,7 +112,7 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
|
||||
|
||||
@Override
|
||||
public AbstractHorseInventory getInventory() {
|
||||
- return new CraftSaddledInventory(getHandle().inventory);
|
||||
+ return new CraftSaddledInventory(getHandle().inventory, this.getHandle().getBodyArmorAccess()); // Paper - use both inventories
|
||||
}
|
||||
|
||||
// Paper start - Horse API
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java
|
||||
index 4946da593713f4d11d88ac1bb68a089f2f6d5ae0..bae0db99a8159bdea71182485b22cce9fc61e00a 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryAbstractHorse.java
|
||||
@@ -6,17 +6,64 @@ import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public class CraftInventoryAbstractHorse extends CraftInventory implements AbstractHorseInventory {
|
||||
|
||||
- public CraftInventoryAbstractHorse(Container inventory) {
|
||||
+ // Paper start - combine both horse inventories
|
||||
+ private final Container bodyArmor;
|
||||
+ public CraftInventoryAbstractHorse(Container inventory, final Container bodyArmor) {
|
||||
super(inventory);
|
||||
+ this.bodyArmor = bodyArmor;
|
||||
+ // Paper end - combine both horse inventories
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getSaddle() {
|
||||
- return this.getItem(0);
|
||||
+ return this.getItem(net.minecraft.world.entity.animal.horse.AbstractHorse.INV_SLOT_SADDLE); // Paper
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setSaddle(ItemStack stack) {
|
||||
- this.setItem(0, stack);
|
||||
+ this.setItem(net.minecraft.world.entity.animal.horse.AbstractHorse.INV_SLOT_SADDLE, stack); // Paper
|
||||
}
|
||||
+
|
||||
+ // Paper start - combine both horse inventories
|
||||
+ public Container getMainInventory() {
|
||||
+ return this.inventory;
|
||||
+ }
|
||||
+
|
||||
+ public Container getArmorInventory() {
|
||||
+ return this.bodyArmor;
|
||||
+ }
|
||||
+
|
||||
+ public ItemStack getArmor() {
|
||||
+ return this.getItem(net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR);
|
||||
+ }
|
||||
+
|
||||
+ public void setArmor(ItemStack armor) {
|
||||
+ this.setItem(net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR, armor);
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public int getSize() {
|
||||
+ return this.getMainInventory().getContainerSize() + this.getArmorInventory().getContainerSize();
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public ItemStack getItem(final int index) {
|
||||
+ if (index == net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR) {
|
||||
+ final net.minecraft.world.item.ItemStack item = this.getArmorInventory().getItem(index);
|
||||
+ return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
|
||||
+ } else {
|
||||
+ final net.minecraft.world.item.ItemStack item = this.getMainInventory().getItem(index);
|
||||
+ return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ @Override
|
||||
+ public void setItem(final int index, final ItemStack item) {
|
||||
+ if (index == net.minecraft.world.inventory.HorseInventoryMenu.SLOT_BODY_ARMOR) {
|
||||
+ this.getArmorInventory().setItem(index, CraftItemStack.asNMSCopy(item));
|
||||
+ } else {
|
||||
+ this.getMainInventory().setItem(index, CraftItemStack.asNMSCopy(item));
|
||||
+ }
|
||||
+ }
|
||||
+ // Paper end - combine both horse inventories
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
|
||||
index 07a304edc2a7b3450a55728e78a4fe37febdbadc..ebf0da48378b9376b3be2ca731315485003f6a89 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
|
||||
@@ -6,21 +6,9 @@ import org.bukkit.inventory.ItemStack;
|
||||
|
||||
public class CraftInventoryHorse extends CraftSaddledInventory implements HorseInventory {
|
||||
|
||||
- private final Container bodyArmorInventory;
|
||||
-
|
||||
+ // Paper start - properly combine both inventories
|
||||
public CraftInventoryHorse(Container inventory, Container bodyArmorInventory) {
|
||||
- super(inventory);
|
||||
- this.bodyArmorInventory = bodyArmorInventory;
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public ItemStack getArmor() {
|
||||
- net.minecraft.world.item.ItemStack item = this.bodyArmorInventory.getItem(0);
|
||||
- return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
|
||||
- }
|
||||
-
|
||||
- @Override
|
||||
- public void setArmor(ItemStack stack) {
|
||||
- this.bodyArmorInventory.setItem(0, CraftItemStack.asNMSCopy(stack));
|
||||
+ super(inventory, bodyArmorInventory);
|
||||
}
|
||||
+ // Paper end - properly combine both inventories
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java
|
||||
index dcbc80646ebfc384c4f6ab1beee46a4b71a67af8..0804b642d966f2cb09f4101410e2ff1d154ea594 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java
|
||||
@@ -6,21 +6,19 @@ import org.bukkit.inventory.LlamaInventory;
|
||||
|
||||
public class CraftInventoryLlama extends CraftInventoryAbstractHorse implements LlamaInventory {
|
||||
|
||||
- private final Container bodyArmorInventory;
|
||||
-
|
||||
+ // Paper start - properly combine both inventories
|
||||
public CraftInventoryLlama(Container inventory, Container bodyArmorInventory) {
|
||||
- super(inventory);
|
||||
- this.bodyArmorInventory = bodyArmorInventory;
|
||||
+ super(inventory, bodyArmorInventory);
|
||||
+ // Paper end - properly combine both inventories
|
||||
}
|
||||
|
||||
@Override
|
||||
public ItemStack getDecor() {
|
||||
- net.minecraft.world.item.ItemStack item = this.bodyArmorInventory.getItem(0);
|
||||
- return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
|
||||
+ return this.getArmor(); // Paper
|
||||
}
|
||||
|
||||
@Override
|
||||
public void setDecor(ItemStack stack) {
|
||||
- this.bodyArmorInventory.setItem(0, CraftItemStack.asNMSCopy(stack));
|
||||
+ this.setArmor(stack); // Paper
|
||||
}
|
||||
}
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
|
||||
index 3a617c07d445bacf5a13e0e3ff6481823cfc8477..1c100c7c210485c1d3510745de7d18f58ba72557 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
|
||||
@@ -5,8 +5,10 @@ import org.bukkit.inventory.SaddledHorseInventory;
|
||||
|
||||
public class CraftSaddledInventory extends CraftInventoryAbstractHorse implements SaddledHorseInventory {
|
||||
|
||||
- public CraftSaddledInventory(Container inventory) {
|
||||
- super(inventory);
|
||||
+ // Paper start - combine both inventories
|
||||
+ public CraftSaddledInventory(Container inventory, final Container bodyArmor) {
|
||||
+ super(inventory, bodyArmor);
|
||||
+ // Paper end - combine both inventories
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user