From 4fee35e7e83f4d5f27192b9a399c65e58bdda95d Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Mon, 13 Apr 2020 18:40:04 -0400 Subject: [PATCH 1/2] Update ServerConsole.tsx Added spaces to be properly spaced apart from current usage --- resources/scripts/components/server/ServerConsole.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/scripts/components/server/ServerConsole.tsx b/resources/scripts/components/server/ServerConsole.tsx index 8593216fc..0440a1b59 100644 --- a/resources/scripts/components/server/ServerConsole.tsx +++ b/resources/scripts/components/server/ServerConsole.tsx @@ -110,7 +110,7 @@ export default () => { className={'mr-1'} />  {bytesToHuman(memory)} - / {server.limits.memory} MB + / {server.limits.memory} MB

{ className={'mr-1'} />  {bytesToHuman(disk)} - / {server.limits.disk} MB + / {server.limits.disk} MB

From 93a62ac637db58817493863e49236e57f8d5c8b2 Mon Sep 17 00:00:00 2001 From: AreYouScared Date: Thu, 16 Apr 2020 20:47:53 -0400 Subject: [PATCH 2/2] Fixed UUID on node creation Fixed nodes not getting a UUID during creation causing a 500 Closes https://github.com/pterodactyl/panel/issues/1930 --- app/Services/Nodes/NodeCreationService.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Services/Nodes/NodeCreationService.php b/app/Services/Nodes/NodeCreationService.php index 261526a91..fabc36e05 100644 --- a/app/Services/Nodes/NodeCreationService.php +++ b/app/Services/Nodes/NodeCreationService.php @@ -2,6 +2,7 @@ namespace Pterodactyl\Services\Nodes; +use Ramsey\Uuid\Uuid; use Illuminate\Support\Str; use Pterodactyl\Models\Node; use Illuminate\Encryption\Encrypter; @@ -41,6 +42,7 @@ class NodeCreationService */ public function handle(array $data) { + $data['uuid'] = Uuid::uuid4()->toString(); $data['daemon_token'] = $this->encrypter->encrypt(Str::random(Node::DAEMON_TOKEN_LENGTH)); $data['daemon_token_id'] = Str::random(Node::DAEMON_TOKEN_ID_LENGTH);