From 7ab028205ba335b25fc89d1294f95e2f358475aa Mon Sep 17 00:00:00 2001
From: Technici4n <13494793+Technici4n@users.noreply.github.com>
Date: Wed, 21 Apr 2021 09:18:36 +0200
Subject: Fix bucket with null fluid (#522)

---
 .../src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'RoughlyEnoughItems-default-plugin/src/main')

diff --git a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
index 03c71c2b3..14305cb81 100644
--- a/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
+++ b/RoughlyEnoughItems-default-plugin/src/main/java/me/shedaniel/rei/plugin/DefaultPlugin.java
@@ -419,8 +419,12 @@ public class DefaultPlugin implements REIPluginV0, BuiltinPlugin {
         recipeHelper.registerContainerClickArea(new Rectangle(78, 32, 28, 23), BlastFurnaceScreen.class, BLASTING);
         FluidSupportProvider.getInstance().registerProvider(itemStack -> {
             Item item = itemStack.getItem();
-            if (item instanceof BucketItem)
-                return InteractionResultHolder.success(Stream.of(EntryStack.create(((BucketItem) item).content, Fraction.ofWhole(1))));
+            if (item instanceof BucketItem) {
+                Fluid fluid = ((BucketItem) item).content;
+                if (fluid != null) {
+                    return InteractionResultHolder.success(Stream.of(EntryStack.create(fluid, Fraction.ofWhole(1))));
+                }
+            }
             return InteractionResultHolder.pass(null);
         });
 //        SubsetsRegistry subsetsRegistry = SubsetsRegistry.INSTANCE;
-- 
cgit