From 846a70f97fe9d270765cda3cbcf702e0ab99b8f5 Mon Sep 17 00:00:00 2001 From: LexManos Date: Fri, 1 Dec 2017 13:22:41 -0800 Subject: [PATCH] Restore binary compatibility in EntityItemPickupEvent --- .../fml/common/gameevent/PlayerEvent.java | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java b/src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java index 5d1a0dbcc6..51d9ec9010 100644 --- a/src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java +++ b/src/main/java/net/minecraftforge/fml/common/gameevent/PlayerEvent.java @@ -35,9 +35,11 @@ public class PlayerEvent extends Event { } public static class ItemPickupEvent extends PlayerEvent { - /** - * Original EntityItem with current remaining stack size - */ + @Deprecated + public final EntityItem pickedUp; + /** + * Original EntityItem with current remaining stack size + */ private final EntityItem originalEntity; /** * Clone item stack, containing the item and amount picked up @@ -46,16 +48,17 @@ public class PlayerEvent extends Event { public ItemPickupEvent(EntityPlayer player, EntityItem entPickedUp, ItemStack stack) { super(player); - originalEntity = entPickedUp; + this.originalEntity = entPickedUp; + this.pickedUp = entPickedUp; this.stack = stack; } - + public ItemStack getStack() { - return stack; + return stack; } - + public EntityItem getOriginalEntity() { - return originalEntity; + return originalEntity; } }