Skip to content

Commit 8237aff

Browse files
Copilotrubensworks
andauthored
Guard ItemBloodContainer extraction against empty fluid resources (#1188)
Agent-Logs-Url: https://github.com/CyclopsMC/EvilCraft/sessions/ed154074-76a3-4b2b-bb3b-33a538f1545a Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: rubensworks <440384+rubensworks@users.noreply.github.com>
1 parent 3c23d95 commit 8237aff

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

src/main/java/org/cyclops/evilcraft/core/item/ItemBloodContainer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ public FluidStack consume(int amount, ItemStack itemStack, @Nullable Player play
210210
try (var tx = Transaction.openRoot()) {
211211
ResourceHandler<FluidResource> fluidHandler = itemStack.getCapability(Capabilities.Fluid.ITEM, ItemAccess.forStack(itemStack));
212212
FluidResource resource = fluidHandler.getResource(0);
213-
int drained = fluidHandler.extract(resource, amount, tx);
213+
int drained = resource.isEmpty() ? 0 : fluidHandler.extract(resource, amount, tx);
214214
if (drained == amount) return resource.toStack(drained);
215215
int toDrain = amount - drained;
216216
FluidStack otherDrained = player == null ? FluidStack.EMPTY : drainFromOthers(toDrain, itemStack, getFluid(), player, tx);

0 commit comments

Comments
 (0)