Add size check to FluidHelpersNeoForge.getFluid to avoid crash when fluidHandler is empty (#229)

Copilot · web-flow · commit 4c576f3a7c25 · 2026-04-20T18:37:28.000+02:00
Closes CyclopsMC/EvilCraft#1197
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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public FluidStack copy(FluidStack fluidStack) {`
`51`	`51`
`52`	`52`	`@Override`
`53`	`53`	`public FluidStack getFluid(@Nullable ResourceHandler<FluidResource> fluidHandler) {`
`54`		`- return fluidHandler != null ? FluidUtil.getStack(fluidHandler, 0) : FluidStack.EMPTY;`
	`54`	`+ return fluidHandler != null && fluidHandler.size() > 0 ? FluidUtil.getStack(fluidHandler, 0) : FluidStack.EMPTY;`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`