From ff7c400885f9e193daa1a944cafb2fc8fef60a6f Mon Sep 17 00:00:00 2001
From: Sollace <sollacea@gmail.com>
Date: Sat, 23 Feb 2019 15:22:53 +0200
Subject: [PATCH] Fixed apple trees only producing rotten apples

---
 .../java/com/minelittlepony/unicopia/init/UBlocks.java    | 2 +-
 .../java/com/minelittlepony/unicopia/item/ItemApple.java  | 8 --------
 .../java/com/minelittlepony/util/collection/Pool.java     | 6 +-----
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/minelittlepony/unicopia/init/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/init/UBlocks.java
index f9ae0fa5..0d4eb2d5 100644
--- a/src/main/java/com/minelittlepony/unicopia/init/UBlocks.java
+++ b/src/main/java/com/minelittlepony/unicopia/init/UBlocks.java
@@ -66,7 +66,7 @@ public class UBlocks {
     public static final Block apple_leaves = new BlockFruitLeaves(Unicopia.MODID, "apple_leaves", apple_tree)
             .setBaseGrowthChance(1200)
             .setTint(0xFFEE81)
-            .setHarvestFruit(w -> ItemApple.getRandomItemStack(null))
+            .setHarvestFruit(ItemApple::getRandomItemStack)
             .setUnharvestFruit(w -> new ItemStack(UItems.rotten_apple));
 
     static void init(IForgeRegistry<Block> registry) {
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java b/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java
index 7dbf1baa..fb434cca 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java
@@ -57,14 +57,6 @@ public class ItemApple extends ItemFood implements IEdible {
                 .orElse(ItemStack.EMPTY);
     }
 
-    public ItemStack getRandomApple() {
-        return getRandomApple(null);
-    }
-
-    public ItemStack getRandomApple(Object variant) {
-        return getRandomItemStack(variant);
-    }
-
     public ItemApple(String domain, String name) {
         super(4, 3, false);
 
diff --git a/src/main/java/com/minelittlepony/util/collection/Pool.java b/src/main/java/com/minelittlepony/util/collection/Pool.java
index 4eac3407..f6c7c20a 100644
--- a/src/main/java/com/minelittlepony/util/collection/Pool.java
+++ b/src/main/java/com/minelittlepony/util/collection/Pool.java
@@ -31,7 +31,7 @@ public class Pool<K, V> extends HashMap<K, V> {
 
     @Override
     public V get(Object key) {
-        if (!containsKey(key)) {
+        if (key == null || !containsKey(key)) {
             key = defaultKey;
         }
 
@@ -39,10 +39,6 @@ public class Pool<K, V> extends HashMap<K, V> {
     }
 
     public Optional<V> getOptional(K key) {
-        if (!containsKey(key)) {
-            return Optional.empty();
-        }
-
         return Optional.ofNullable(get(key));
     }
 }