From 97e7d660e4c8ff31581a70c972760f6386469dbc Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 21 Jul 2021 09:09:50 -0300 Subject: [PATCH] fix inventories for armorstands, fixes #1017 --- .../java/carpet/script/value/NBTSerializableValue.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java index f2993e32..a6acda78 100644 --- a/src/main/java/carpet/script/value/NBTSerializableValue.java +++ b/src/main/java/carpet/script/value/NBTSerializableValue.java @@ -235,11 +235,11 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa { Inventory inv = null; Entity e = ((EntityValue) v1).getEntity(); - if (e instanceof PlayerEntity) inv = ((PlayerEntity) e).getInventory(); + if (e instanceof PlayerEntity pe) inv = pe.getInventory(); else if (e instanceof Inventory) inv = (Inventory) e; - else if (e instanceof InventoryOwner) inv = ((InventoryOwner) e).getInventory(); - else if (e instanceof InventoryBearerInterface) inv = ((InventoryBearerInterface)e).getCMInventory(); // horse only - else if (e instanceof LivingEntity) return new InventoryLocator(e, e.getBlockPos(), new EquipmentInventory((MobEntity) e), offset+1); + else if (e instanceof InventoryOwner io) inv = io.getInventory(); + else if (e instanceof InventoryBearerInterface ibi) inv = ibi.getCMInventory(); // horse only + else if (e instanceof LivingEntity le) return new InventoryLocator(e, e.getBlockPos(), new EquipmentInventory(le), offset+1); if (inv == null) return null;