Merge pull request #213 from way2muchnoise/1.7-update

jakimfett · jakimfett · commit 872da46a0854 · 2014-10-05T12:31:43.000-07:00
should fix ticking proxy entitys
diff --git a/src/main/java/minechem/tileentity/prefab/TileEntityProxy.java b/src/main/java/minechem/tileentity/prefab/TileEntityProxy.java
@@ -188,7 +188,7 @@ public boolean hasCustomInventoryName()
 	@Override
 	public int getInventoryStackLimit()
 	{
-		if (this.getManager() != null && this.getManager() instanceof ISidedInventory)
+		if (this.manager != null && this.manager != this)
 		{
 			return ((ISidedInventory) this.getManager()).getInventoryStackLimit();
 		}

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public boolean hasCustomInventoryName()`
`188`	`188`	`@Override`
`189`	`189`	`public int getInventoryStackLimit()`
`190`	`190`	`{`
`191`		`- if (this.getManager() != null && this.getManager() instanceof ISidedInventory)`
	`191`	`+ if (this.manager != null && this.manager != this)`
`192`	`192`	`{`
`193`	`193`	`return ((ISidedInventory) this.getManager()).getInventoryStackLimit();`
`194`	`194`	`}`