Fix ModuleLayerHandler#getLayer NPE on missing layer, closes #104 (#105)

Su5eD · web-flow · commit 6d11a6f010d4 · 2022-03-21T13:59:05.000+01:00
diff --git a/src/main/java/cpw/mods/modlauncher/ModuleLayerHandler.java b/src/main/java/cpw/mods/modlauncher/ModuleLayerHandler.java
@@ -84,7 +84,7 @@ public LayerInfo buildLayer(final Layer layer) {
 
     @Override
     public Optional<ModuleLayer> getLayer(final Layer layer) {
-        return Optional.ofNullable(completedLayers.get(layer).layer());
+        return Optional.ofNullable(completedLayers.get(layer)).map(LayerInfo::layer);
     }
 
     public void updateLayer(Layer layer, Consumer<LayerInfo> action) {

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ public LayerInfo buildLayer(final Layer layer) {`
`84`	`84`
`85`	`85`	`@Override`
`86`	`86`	`public Optional<ModuleLayer> getLayer(final Layer layer) {`
`87`		`- return Optional.ofNullable(completedLayers.get(layer).layer());`
	`87`	`+ return Optional.ofNullable(completedLayers.get(layer)).map(LayerInfo::layer);`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`public void updateLayer(Layer layer, Consumer<LayerInfo> action) {`