Fix NPEs in villager Container classes

Orange1861 · May 30, 2017 · 855a9bb · 855a9bb
1 parent 66a1d7e
commit 855a9bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/orangeVillager61/ImprovedVillagers/Container/ContainerIvVillagerHauler.java b/src/main/java/orangeVillager61/ImprovedVillagers/Container/ContainerIvVillagerHauler.java
@@ -18,7 +18,8 @@ public class ContainerIvVillagerHauler extends Container{
 
 
 	public ContainerIvVillagerHauler(IvVillager villager, IInventory playerInv){
-		IItemHandler handler = this.villager.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+		this.villager = villager;
+		this.handler = this.villager.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
 
 		this.addSlotToContainer(new SlotItemHandler(handler, 0, 44, 23));
 		this.addSlotToContainer(new SlotItemHandler(handler, 1, 62, 23));

diff --git a/...main/java/orangeVillager61/ImprovedVillagers/Container/ContainerIvVillagerHireNitwit.java b/...main/java/orangeVillager61/ImprovedVillagers/Container/ContainerIvVillagerHireNitwit.java
@@ -16,7 +16,8 @@ public class ContainerIvVillagerHireNitwit extends Container{
 	private IItemHandler handler;
 
 	public ContainerIvVillagerHireNitwit(IvVillager villager, IInventory playerInv){
-		IItemHandler handler = this.villager.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+		this.villager = villager;
+		this.handler = this.villager.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
 
 		this.addSlotToContainer(new SlotItemHandler(handler, 0, 76, 47));
 		int xPos = 8;