mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-27 23:47:38 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use safer fluidstack comparisons in FluidIngredient (#6317)

Browse source 
* Use safer fluidstack comparisons

* switched to getFluid check
This commit is contained in:
TelepathicGrunt 2024-06-23 09:46:36 -04:00 committed by GitHub
parent d66170c8fe
commit 75d337ba8c
Failed to generate hash of commit
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/com/simibubi/create/foundation/fluid/FluidIngredient.java
View file

@ -152,8 +152,7 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
@Override @Override
protected boolean testInternal(FluidStack t) { protected boolean testInternal(FluidStack t) {
if (!t.getFluid() if (t.getFluid() != fluid)
.isSame(fluid))
return false; return false;
if (tagToMatch.isEmpty()) if (tagToMatch.isEmpty())
return true; return true;
@ -206,8 +205,7 @@ public abstract class FluidIngredient implements Predicate<FluidStack> {
protected boolean testInternal(FluidStack t) { protected boolean testInternal(FluidStack t) {
if (tag == null) { if (tag == null) {
for (FluidStack accepted : getMatchingFluidStacks()) for (FluidStack accepted : getMatchingFluidStacks())
if (accepted.getFluid() if (accepted.getFluid() != t.getFluid())
.isSame(t.getFluid()))
return true; return true;
return false; return false;
} }