From 4a89971f22c252479711d18711dc8a69a7f237a8 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 20 Apr 2026 14:51:27 +0000
Subject: [PATCH] Add size check to getFluid to avoid crash when fluidHandler
 is empty

Agent-Logs-Url: https://github.com/CyclopsMC/CyclopsCore/sessions/d6e55795-2093-45c1-a10d-98151095c9dc

Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>
---
 .../org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java b/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java
index 592b6ba469..5cf262c531 100644
--- a/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java
+++ b/loader-neoforge/src/main/java/org/cyclops/cyclopscore/helper/FluidHelpersNeoForge.java
@@ -51,7 +51,7 @@ public FluidStack copy(FluidStack fluidStack) {
 
     @Override
     public FluidStack getFluid(@Nullable ResourceHandler<FluidResource> fluidHandler) {
-        return fluidHandler != null ? FluidUtil.getStack(fluidHandler, 0) : FluidStack.EMPTY;
+        return fluidHandler != null && fluidHandler.size() > 0 ? FluidUtil.getStack(fluidHandler, 0) : FluidStack.EMPTY;
     }
 
     @Override