Origins: Fix #408.

EdwinMindcraft · Mar 11, 2024 · 0da1af0 · 0da1af0
1 parent afdfc32
commit 0da1af0
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/main/java/io/github/apace100/origins/command/OriginArgumentType.java b/src/main/java/io/github/apace100/origins/command/OriginArgumentType.java
@@ -48,12 +48,14 @@ public static ResourceKey<Origin> getOrigin(CommandContext<CommandSourceStack> c
 	public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
 
 		List<ResourceLocation> availableOrigins = new ArrayList<>();
-		availableOrigins.add(OriginsBuiltinRegistries.ORIGINS.get().getKey(Origin.EMPTY));
 
-		ResourceLocation originLayerId = context.getArgument("layer", ResourceLocation.class);
-		OriginLayer originLayer = OriginsAPI.getLayersRegistry().get(originLayerId);
+		try {
+			ResourceLocation originLayerId = context.getArgument("layer", ResourceLocation.class);
+			OriginLayer originLayer = OriginsAPI.getLayersRegistry().get(originLayerId);
 
-		availableOrigins.addAll(originLayer.origins().stream().map(Holder::unwrapKey).flatMap(Optional::stream).map(ResourceKey::location).collect(Collectors.toCollection(LinkedList::new)));
+			availableOrigins.add(OriginsBuiltinRegistries.ORIGINS.get().getKey(Origin.EMPTY));
+			if (originLayer != null) availableOrigins.addAll(originLayer.origins().stream().map(Holder::unwrapKey).flatMap(Optional::stream).map(ResourceKey::location).collect(Collectors.toCollection(LinkedList::new)));
+		} catch (IllegalArgumentException ignored) {}
 
 		return SharedSuggestionProvider.suggestResource(availableOrigins.stream(), builder);
 	}