aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/api
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2024-02-17 13:23:13 +0000
committerGitHub <noreply@github.com>2024-02-17 14:23:13 +0100
commit3cc16f2a9acf2eae0496e609230efe7e06316026 (patch)
tree29d387f9ac7bf24c88f238b94a314e72831e51e2 /src/main/java/gregtech/api
parent985a6c94cae0cb895a09ef06c85ec7759132a06c (diff)
downloadGT5-Unofficial-3cc16f2a9acf2eae0496e609230efe7e06316026.tar.gz
GT5-Unofficial-3cc16f2a9acf2eae0496e609230efe7e06316026.tar.bz2
GT5-Unofficial-3cc16f2a9acf2eae0496e609230efe7e06316026.zip
Fix water bottle fluid exploit (#2494)
* fix water bottle fluid amount * require 1000L minimum
Diffstat (limited to 'src/main/java/gregtech/api')
-rw-r--r--src/main/java/gregtech/api/util/GT_Utility.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 7959789532..64010efb99 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -1891,6 +1891,12 @@ public class GT_Utility {
public static ItemStack fillFluidContainer(FluidStack aFluid, ItemStack aStack, boolean aRemoveFluidDirectly,
boolean aCheckIFluidContainerItems) {
if (isStackInvalid(aStack) || aFluid == null) return null;
+ if (GT_ModHandler.isWater(aFluid) && ItemList.Bottle_Empty.isStackEqual(aStack)) {
+ if (aFluid.amount >= 1000) {
+ return new ItemStack(Items.potionitem, 1, 0);
+ }
+ return null;
+ }
if (aCheckIFluidContainerItems && aStack.getItem() instanceof IFluidContainerItem
&& ((IFluidContainerItem) aStack.getItem()).getFluid(aStack) == null
&& ((IFluidContainerItem) aStack.getItem()).getCapacity(aStack) <= aFluid.amount) {