beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #570 from ok236449/small-fixes

Browse source 
Small fixes
This commit is contained in:
Dennis 2022-08-19 22:58:05 +02:00 committed by GitHub
parent a4d83a75d9 16067c6cc8
commit 6edc923e3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Classes/Pterodactyl.php
View file

@ -363,8 +363,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;
}

7
app/Http/Controllers/ServerController.php
View file

@ -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);