From 4cb7a9e6f4cf53d18758f6106d068647390ec536 Mon Sep 17 00:00:00 2001
From: yueh <yueh@orod.de>
Date: Tue, 4 Oct 2016 19:18:56 +0200
Subject: [PATCH] Fixes #2434: Set default pickup delay to custom entities.

---
 src/main/java/appeng/items/materials/ItemMaterial.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/main/java/appeng/items/materials/ItemMaterial.java b/src/main/java/appeng/items/materials/ItemMaterial.java
index f062f5919..3971e9225 100644
--- a/src/main/java/appeng/items/materials/ItemMaterial.java
+++ b/src/main/java/appeng/items/materials/ItemMaterial.java
@@ -139,7 +139,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 	public MaterialType getTypeByStack( final ItemStack is )
 	{
 		MaterialType type = this.dmgToMaterial.get( is.getItemDamage() );
-		return (type != null) ? type : MaterialType.InvalidType;
+		return ( type != null ) ? type : MaterialType.InvalidType;
 	}
 
 	@Override
@@ -260,7 +260,8 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 	protected void getCheckedSubItems( final Item sameItem, final CreativeTabs creativeTab, final List<ItemStack> itemStacks )
 	{
 		final List<MaterialType> types = Arrays.asList( MaterialType.values() );
-		Collections.sort( types, new Comparator<MaterialType>(){
+		Collections.sort( types, new Comparator<MaterialType>()
+		{
 
 			@Override
 			public int compare( final MaterialType o1, final MaterialType o2 )
@@ -351,9 +352,7 @@ public final class ItemMaterial extends AEBaseItem implements IStorageComponent,
 
 		if( location instanceof EntityItem && eqi instanceof EntityItem )
 		{
-			// TODO: Entity Pick up time?
-			// needs fixing?
-			// ( (EntityItem) eqi ).setPickupDelay( ( (EntityItem) location ).pick;
+			( (EntityItem) eqi ).setDefaultPickupDelay();
 		}
 
 		return eqi;