Avoid FenceData NPE.

This commit is contained in:
MobiusDev 2018-09-04 02:42:50 +00:00
parent 908705a276
commit bc3f982d7b
8 changed files with 16 additions and 8 deletions

View File

@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)

View File

@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)

View File

@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)

View File

@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)

View File

@ -182,7 +182,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)

View File

@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)

View File

@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)

View File

@ -184,7 +184,8 @@ public final class FenceData implements IGameXmlReader
return false;
};
return _regions.getOrDefault(L2World.getInstance().getRegion(x, y, z), Collections.emptyList()).stream().anyMatch(filter);
final L2WorldRegion region = L2World.getInstance().getRegion(x, y, z); // FIXME: Should not be null.
return region == null ? false : _regions.getOrDefault(region, Collections.emptyList()).stream().anyMatch(filter);
}
private boolean crossLinePart(double x1, double y1, double x2, double y2, double x3, double y3, double x4, double y4, double xMin, double yMin, double xMax, double yMax)