Merge pull request #3181 from sk7725/patch-23

Make LiquidTurret not need to have water as an ammo(bugfix)
This commit is contained in:
Anuken 2020-10-29 10:22:26 -04:00 committed by GitHub
commit 79624ff7cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -144,7 +144,7 @@ public class LiquidTurret extends Turret{
@Override
public boolean acceptLiquid(Building source, Liquid liquid){
return ammoTypes.get(liquid) != null
&& (liquids.current() == liquid || (ammoTypes.containsKey(liquids.current())
&& (liquids.current() == liquid || (ammoTypes.containsKey(liquid)
&& liquids.get(liquids.current()) <= 1f / ammoTypes.get(liquids.current()).ammoMultiplier + 0.001f));
}
}