From 50bc729381ff3352e86b2cb4afb7bb68d8b2e07e Mon Sep 17 00:00:00 2001 From: Prototik Date: Mon, 29 Jun 2015 20:31:50 +0700 Subject: [PATCH] Fixed custom modded inventories not being synced on bukkit side after spawning in world. (fix #75) --- .../org/bukkit/craftbukkit/entity/CraftHumanEntity.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java index a81d443..f790554 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java @@ -29,16 +29,14 @@ import org.bukkit.plugin.Plugin; public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { private CraftInventoryPlayer inventory; - private final CraftInventory enderChest; + private CraftInventory enderChest; protected final PermissibleBase perm = new PermissibleBase(this); private boolean op; private GameMode mode; public CraftHumanEntity(final CraftServer server, final net.minecraft.entity.player.EntityPlayer entity) { super(server, entity); - mode = server.getDefaultGameMode(); - this.inventory = new CraftInventoryPlayer(entity.inventory); - enderChest = new CraftInventory(entity.getInventoryEnderChest()); + mode = server.getDefaultGameMode(); } public String getName() { @@ -46,6 +44,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { } public PlayerInventory getInventory() { + if (inventory == null) inventory = new CraftInventoryPlayer(((net.minecraft.entity.player.EntityPlayer) entity).inventory); return inventory; } @@ -54,6 +53,7 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity { } public Inventory getEnderChest() { + if (enderChest == null) enderChest = new CraftInventory(((net.minecraft.entity.player.EntityPlayer) entity).getInventoryEnderChest()); return enderChest; }