icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix inventories for armorstands, fixes #1017

Browse Source
This commit is contained in:
gnembon committed 2021-07-21 09:09:50 -03:00
1 parent 38e5da05dd
commit 97e7d660e4
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/carpet/script/value/NBTSerializableValue.java
+4 -4
View File
@@ -235,11 +235,11 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa
{ {
Inventory inv = null; Inventory inv = null;
Entity e = ((EntityValue) v1).getEntity(); 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 Inventory) inv = (Inventory) e;
else if (e instanceof InventoryOwner) inv = ((InventoryOwner) e).getInventory(); else if (e instanceof InventoryOwner io) inv = io.getInventory();
else if (e instanceof InventoryBearerInterface) inv = ((InventoryBearerInterface)e).getCMInventory(); // horse only else if (e instanceof InventoryBearerInterface ibi) inv = ibi.getCMInventory(); // horse only
else if (e instanceof LivingEntity) return new InventoryLocator(e, e.getBlockPos(), new EquipmentInventory((MobEntity) e), offset+1); else if (e instanceof LivingEntity le) return new InventoryLocator(e, e.getBlockPos(), new EquipmentInventory(le), offset+1);
if (inv == null) if (inv == null)
return null; return null;