Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-04-12 06:57:04 +02:00
Code Issues Projects Releases Wiki Activity

SPIGOT-7666: Fix access to llama and horse special slot

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot 2024-05-10 19:23:01 +10:00
parent 54f230de84
commit 317917800c
4 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftHorse.java
View File

@ -59,7 +59,7 @@ public class CraftHorse extends CraftAbstractHorse implements Horse {
@Override @Override
public HorseInventory getInventory() { public HorseInventory getInventory() {
return new CraftInventoryHorse(getHandle().inventory); return new CraftInventoryHorse(getHandle().inventory, getHandle().getBodyArmorAccess());
} }
@Override @Override

2
paper-server/src/main/java/org/bukkit/craftbukkit/entity/CraftLlama.java
View File

@ -34,7 +34,7 @@ public class CraftLlama extends CraftChestedHorse implements Llama {
@Override @Override
public LlamaInventory getInventory() { public LlamaInventory getInventory() {
return new CraftInventoryLlama(getHandle().inventory); return new CraftInventoryLlama(getHandle().inventory, getHandle().getBodyArmorAccess());
} }
@Override @Override

10
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
View File

@ -6,17 +6,21 @@ import org.bukkit.inventory.ItemStack;
public class CraftInventoryHorse extends CraftInventoryAbstractHorse implements HorseInventory { public class CraftInventoryHorse extends CraftInventoryAbstractHorse implements HorseInventory {
public CraftInventoryHorse(IInventory inventory) { private final IInventory bodyArmorInventory;
public CraftInventoryHorse(IInventory inventory, IInventory bodyArmorInventory) {
super(inventory); super(inventory);
this.bodyArmorInventory = bodyArmorInventory;
} }
@Override @Override
public ItemStack getArmor() { public ItemStack getArmor() {
return getItem(1); net.minecraft.world.item.ItemStack item = bodyArmorInventory.getItem(0);
return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
} }
@Override @Override
public void setArmor(ItemStack stack) { public void setArmor(ItemStack stack) {
setItem(1, stack); bodyArmorInventory.setItem(0, CraftItemStack.asNMSCopy(stack));
} }
} }

10
paper-server/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryLlama.java
View File

@ -6,17 +6,21 @@ import org.bukkit.inventory.LlamaInventory;
public class CraftInventoryLlama extends CraftInventoryAbstractHorse implements LlamaInventory { public class CraftInventoryLlama extends CraftInventoryAbstractHorse implements LlamaInventory {
public CraftInventoryLlama(IInventory inventory) { private final IInventory bodyArmorInventory;
public CraftInventoryLlama(IInventory inventory, IInventory bodyArmorInventory) {
super(inventory); super(inventory);
this.bodyArmorInventory = bodyArmorInventory;
} }
@Override @Override
public ItemStack getDecor() { public ItemStack getDecor() {
return getItem(1); net.minecraft.world.item.ItemStack item = bodyArmorInventory.getItem(0);
return item.isEmpty() ? null : CraftItemStack.asCraftMirror(item);
} }
@Override @Override
public void setDecor(ItemStack stack) { public void setDecor(ItemStack stack) {
setItem(1, stack); bodyArmorInventory.setItem(0, CraftItemStack.asNMSCopy(stack));
} }
} }