From c929fd7dddaf651ce71c05ac4debb7d60b47d958 Mon Sep 17 00:00:00 2001 From: ok236449 Date: Fri, 19 Aug 2022 20:14:30 +0200 Subject: [PATCH 1/2] fix overallocation --- app/Classes/Pterodactyl.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Classes/Pterodactyl.php b/app/Classes/Pterodactyl.php index a7bc9bd5..f03ef5de 100644 --- a/app/Classes/Pterodactyl.php +++ b/app/Classes/Pterodactyl.php @@ -368,8 +368,8 @@ class Pterodactyl throw self::getException($e->getMessage()); } $node = $response['attributes']; - $freeMemory = $node['memory'] - $node['allocated_resources']['memory']; - $freeDisk = $node['disk'] - $node['allocated_resources']['disk']; + $freeMemory = ($node['memory']*($node['memory_overallocate']+100)/100) - $node['allocated_resources']['memory']; + $freeDisk = ($node['disk']*($node['disk_overallocate']+100)/100) - $node['allocated_resources']['disk']; if ($freeMemory < $requireMemory) { return false; } From 16067c6cc8882e18b2208e37b0aa95d4667d522c Mon Sep 17 00:00:00 2001 From: ok236449 Date: Fri, 19 Aug 2022 21:50:04 +0200 Subject: [PATCH 2/2] sync renamed servers on Pterodactyl --- app/Http/Controllers/ServerController.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php index cf731ddf..20deffca 100644 --- a/app/Http/Controllers/ServerController.php +++ b/app/Http/Controllers/ServerController.php @@ -45,6 +45,13 @@ class ServerController extends Controller $server->node = $serverRelationships['node']['attributes']['name']; + //Check if a server got renamed on Pterodactyl + $savedServer = Server::query()->where('id', $server->id)->first(); + if($savedServer->name != $serverAttributes['name']){ + $savedServer->name = $serverAttributes['name']; + $server->name = $serverAttributes['name']; + $savedServer->save(); + } //get productname by product_id for server $product = Product::find($server->product_id);