fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix facade recipes. Hopefully the last null check fix.

Browse Source
This commit is contained in:
Gunther De Wachter
2017-06-27 20:39:06 +02:00
parent b819fe4adb
commit 61b81fc802
52 changed files with 101 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/entity/EntityChargedQuartz.java
+1 -1
View File
@@ -119,7 +119,7 @@ public final class EntityChargedQuartz extends AEBaseEntityItem
if( e instanceof EntityItem && !e.isDead )
{
final ItemStack other = ( (EntityItem) e ).getEntityItem();
if( other != null && other.getCount() > 0 )
if( !other.isEmpty() && other.getCount() > 0 )
{
if( Platform.itemComparisons().isEqualItem( other, new ItemStack( Items.REDSTONE ) ) )
{
src/main/java/appeng/entity/EntitySingularity.java
+1 -1
View File
@@ -93,7 +93,7 @@ public final class EntitySingularity extends AEBaseEntityItem
if( e instanceof EntityItem )
{
final ItemStack other = ( (EntityItem) e ).getEntityItem();
if( other != null )
if( !other.isEmpty() )
{
boolean matches = false;
for( final ItemStack is : OreDictionary.getOres( "dustEnder" ) )
src/main/java/appeng/entity/EntityTinyTNTPrimed.java
+1
View File
@@ -29,6 +29,7 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.MoverType;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.init.Blocks;
import net.minecraft.init.SoundEvents;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumParticleTypes;