Fix for the EntityItemPickupEvent having 0 count item when event is fired. (#4549)

src/main/java/net/minecraftforge/fml/common/FMLCommonHandler.java

@@ -583,9 +583,9 @@ public class FMLCommonHandler
         bus().post(new PlayerEvent.PlayerRespawnEvent(player, endConquered));
     }
 
-    public void firePlayerItemPickupEvent(EntityPlayer player, EntityItem item)
+    public void firePlayerItemPickupEvent(EntityPlayer player, EntityItem item, ItemStack clone)
     {
-        bus().post(new PlayerEvent.ItemPickupEvent(player, item));
+        bus().post(new PlayerEvent.ItemPickupEvent(player, item, clone));
     }
 
     public void firePlayerCraftingEvent(EntityPlayer player, ItemStack crafted, IInventory craftMatrix)

src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java

@@ -35,11 +35,27 @@ public class PlayerEvent extends Event {
     }
 
     public static class ItemPickupEvent extends PlayerEvent {
-        public final EntityItem pickedUp;
-        public ItemPickupEvent(EntityPlayer player, EntityItem pickedUp)
+    	/**
+    	 * Original EntityItem with current remaining stack size
+    	 */
+        private final EntityItem originalEntity;
+        /**
+         * Clone item stack, containing the item and amount picked up
+         */
+        private final ItemStack stack;
+        public ItemPickupEvent(EntityPlayer player, EntityItem entPickedUp, ItemStack stack)
         {
             super(player);
-            this.pickedUp = pickedUp;
+            originalEntity = entPickedUp;
+            this.stack = stack;
+        }
+        
+        public ItemStack getStack() {
+        	return stack;
+        }
+        
+        public EntityItem getOriginalEntity() {
+        	return originalEntity;
         }
     }