Skip to content

Commit 3c278a8

Browse files
committed
api(remote): check if transfer is present before trying to update status
1 parent 794248d commit 3c278a8

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

app/Http/Controllers/Api/Remote/Servers/ServerTransferController.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use Pterodactyl\Http\Controllers\Controller;
1212
use Pterodactyl\Repositories\Eloquent\ServerRepository;
1313
use Pterodactyl\Repositories\Wings\DaemonServerRepository;
14+
use Symfony\Component\HttpKernel\Exception\ConflictHttpException;
1415
use Pterodactyl\Exceptions\Http\Connection\DaemonConnectionException;
1516

1617
class ServerTransferController extends Controller
@@ -33,6 +34,10 @@ public function __construct(
3334
public function failure(string $uuid): JsonResponse
3435
{
3536
$server = $this->repository->getByUuid($uuid);
37+
$transfer = $server->transfer;
38+
if (is_null($transfer)) {
39+
throw new ConflictHttpException('Server is not being transferred.');
40+
}
3641

3742
return $this->processFailedTransfer($server->transfer);
3843
}
@@ -46,6 +51,9 @@ public function success(string $uuid): JsonResponse
4651
{
4752
$server = $this->repository->getByUuid($uuid);
4853
$transfer = $server->transfer;
54+
if (is_null($transfer)) {
55+
throw new ConflictHttpException('Server is not being transferred.');
56+
}
4957

5058
/** @var \Pterodactyl\Models\Server $server */
5159
$server = $this->connection->transaction(function () use ($server, $transfer) {

0 commit comments

Comments
 (0)