Merge branch 'master' into 1.15

This commit is contained in:
gnembon committed 2020-01-17 17:17:34 -04:00
commit 7a62923f8b
1 file changed
+2 -5
@@ -808,11 +808,8 @@ public class CarpetExpression
if (lv.size() == locator.offset)
{
PointOfInterestType poiType = store.getType(pos).orElse(null);
if (poiType == null)
{
CarpetSettings.LOG.error("no poi");
return LazyValue.NULL;
}
if (poiType == null) return LazyValue.NULL;
// this feels wrong, but I don't want to mix-in more than I really need to.
// also distance adds 0.5 to each point which screws up accurate distance calculations
// you shoudn't be using POI with that in mind anyways, so I am not worried about it.