Merge branch 'craftingtree-tweaks' into AE2-Omnifactory

gradle.properties

@@ -4,7 +4,7 @@ aebuild=7
 aegroup=appeng
 aebasename=appliedenergistics2
 extended=extended_life
-extendedversion=v50f
+extendedversion=v50g
 #########################################################
 # Versions                                              #
 #########################################################

src/main/java/appeng/crafting/CraftingJob.java

@@ -167,7 +167,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 				}
 
 				craftingTreeWatch.stop();
-				this.logCraftingJob( "real", craftingTreeWatch );
+				this.logCraftingJob( "real, success", craftingTreeWatch );
 			}
 			catch( final CraftBranchFailure e )
 			{
@@ -199,7 +199,7 @@ public class CraftingJob implements Runnable, ICraftingJob
 					else
 					{
 						craftingTreeWatch.stop();
-						this.logCraftingJob( "real", craftingTreeWatch );
+						this.logCraftingJob( "real, failed", craftingTreeWatch );
 					}
 				}
 				catch( final CraftBranchFailure e1 )
@@ -266,12 +266,13 @@ public class CraftingJob implements Runnable, ICraftingJob
 					AELog.craftingDebug( "crafting job now active" );
 				}
 			}
-
-			if( Thread.interrupted() )
-			{
-				throw new InterruptedException();
-			}
 		}
+		
+		if( Thread.interrupted() )
+		{
+			throw new InterruptedException();
+		}
+
 		this.incTime++;
 	}
 

src/main/java/appeng/crafting/MECraftingInventory.java

@@ -139,14 +139,7 @@ public class MECraftingInventory implements IMEInventory<IAEItemStack>
 		this.localCache = new ItemListIgnoreCrafting<>( AEApi.instance().storage().getStorageChannel( IItemStorageChannel.class ).createList() );
 		for( final IAEItemStack is : target.getStorageList() )
 		{
-			if( src.player().isPresent() )
-			{
-				this.localCache.add( target.extractItems( is, Actionable.SIMULATE, src ) );
-			}
-			else
-			{
-				this.localCache.add( is );
-			}
+			this.localCache.add( target.extractItems( is, Actionable.SIMULATE, src ) );
 		}
 
 		this.par = null;