From 0be201164598c3a4cc9e5a961f11e0ca80a7e975 Mon Sep 17 00:00:00 2001
From: Gunther De Wachter <GuntherDW@gmail.com>
Date: Wed, 28 Jun 2017 06:21:11 +0200
Subject: [PATCH] Fixed blank patterns in the pattern terminal not decreasing
 when encoding a pattern.

---
 .../container/implementations/ContainerPatternTerm.java     | 6 +++---
 src/main/java/appeng/helpers/PatternHelper.java             | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
index 64d5455b8..b9600fb6f 100644
--- a/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
+++ b/src/main/java/appeng/container/implementations/ContainerPatternTerm.java
@@ -197,13 +197,13 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 		else if( output.isEmpty() )
 		{
 			output = this.patternSlotIN.getStack();
-			if( output.isEmpty()  || !this.isPattern( output ) )
+			if( output.isEmpty() || !this.isPattern( output ) )
 			{
 				return; // no blanks.
 			}
 
 			// remove one, and clear the input slot.
-			output.setCount( output.getCount() );
+			output.setCount( output.getCount() - 1);
 			if( output.getCount() == 0 )
 			{
 				this.patternSlotIN.putStack( ItemStack.EMPTY );
@@ -319,7 +319,7 @@ public class ContainerPatternTerm extends ContainerMEMonitorable implements IAEA
 	{
 		final NBTTagCompound c = new NBTTagCompound();
 
-		if( i != null )
+		if( !i.isEmpty() )
 		{
 			i.writeToNBT( c );
 		}
diff --git a/src/main/java/appeng/helpers/PatternHelper.java b/src/main/java/appeng/helpers/PatternHelper.java
index e8b91b1ac..33da9a5b1 100644
--- a/src/main/java/appeng/helpers/PatternHelper.java
+++ b/src/main/java/appeng/helpers/PatternHelper.java
@@ -115,7 +115,7 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 		else
 		{
 			this.standardRecipe = null;
-			this.correctOutput = null;
+			this.correctOutput = ItemStack.EMPTY;
 
 			for( int x = 0; x < outTag.tagCount(); x++ )
 			{
@@ -332,10 +332,10 @@ public class PatternHelper implements ICraftingPatternDetails, Comparable<Patter
 	{
 		if( this.crafting.getStackInSlot( slotIndex ).isEmpty() )
 		{
-			return i == null ? TestStatus.ACCEPT : TestStatus.DECLINE;
+			return i.isEmpty() ? TestStatus.ACCEPT : TestStatus.DECLINE;
 		}
 
-		if( i == null )
+		if( i.isEmpty() )
 		{
 			return TestStatus.DECLINE;
 		}