Skip to content

Commit 4d73320

Browse files
committed
fix null errors
1 parent 35fce25 commit 4d73320

1 file changed

Lines changed: 8 additions & 3 deletions

File tree

minecraft-modrinth/src/Services/MinecraftModrinthService.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,16 @@ public function getMinecraftVersion(Server $server): ?string
2525
public function getModrinthProjects(Server $server, int $page = 1, ?string $search = null): array
2626
{
2727
$projectType = ModrinthProjectType::fromServer($server)?->value;
28+
$minecraftLoader = MinecraftLoader::fromServer($server)?->value;
2829

29-
if (!$projectType) {
30+
if (!$projectType || !$minecraftLoader) {
3031
return [
3132
'hits' => [],
3233
'total_hits' => 0,
3334
];
3435
}
3536

3637
$minecraftVersion = $this->getMinecraftVersion($server);
37-
$minecraftLoader = MinecraftLoader::fromServer($server)->value;
3838

3939
$data = [
4040
'offset' => ($page - 1) * 20,
@@ -72,8 +72,13 @@ public function getModrinthProjects(Server $server, int $page = 1, ?string $sear
7272
/** @return array<int, mixed> */
7373
public function getModrinthVersions(string $projectId, Server $server): array
7474
{
75+
$minecraftLoader = MinecraftLoader::fromServer($server)?->value;
76+
77+
if (!$minecraftLoader) {
78+
return [];
79+
}
80+
7581
$minecraftVersion = $this->getMinecraftVersion($server);
76-
$minecraftLoader = MinecraftLoader::fromServer($server)->value;
7782

7883
$data = [
7984
'game_versions' => "[\"$minecraftVersion\"]",

0 commit comments

Comments
 (0)