Merge pull request #30 from repo-alt/rv3-1.7.10

Formation plane fixed for parts and fireworks
GTNewHorizons · Nov 27, 2020 · d4b7cd5 · d4b7cd5
2 parents 8dc0bd5 + 46c1e4d
commit d4b7cd5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 aeversion=rv3
 aechannel=beta
-aebuild=34
+aebuild=35
 #KEEP V6 FOR MOD SUPPORT
 aegroup=appeng
 aebasename=appliedenergistics2

diff --git a/src/main/java/appeng/parts/automation/PartFormationPlane.java b/src/main/java/appeng/parts/automation/PartFormationPlane.java
@@ -428,7 +428,7 @@ public IAEItemStack injectItems( final IAEItemStack input, final Actionable type
 
 		if( w.getBlock( x, y, z ).isReplaceable( w, x, y, z ) )
 		{
-			if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof IPartItem || i instanceof ItemReed ) )
+			if( placeBlock == YesNo.YES && ( i instanceof ItemBlock || i instanceof IPlantable || i instanceof ItemSkull || i instanceof ItemFirework || i instanceof ItemReed ) )
 			{
 				final EntityPlayer player = Platform.getPlayer( (WorldServer) w );
 				Platform.configurePlayer( player, side, this.getTile() );
@@ -476,6 +476,11 @@ public IAEItemStack injectItems( final IAEItemStack input, final Actionable type
 
 						maxStorage -= is.stackSize;
 					}
+					else if (i instanceof ItemFirework)
+					{
+						i.onItemUse( is, player, w, x, y, z, side.getOpposite().ordinal(), side.offsetX, side.offsetY, side.offsetZ );
+						maxStorage -= is.stackSize;
+					}
 					else
 					{
 						player.setCurrentItemOrArmor( 0, is.copy() );