Merge branch 'develop' of https://github.com/Pterodactyl/Panel into develop

app/Console/Commands/InfoCommand.php

@@ -30,6 +30,11 @@ use Illuminate\Contracts\Config\Repository as ConfigRepository;
 
 class InfoCommand extends Command
 {
+    /**
+     * @var string
+     */
+    protected $description = 'Displays the application, database, and email configurations along with the panel version.';
+
     /**
      * @var \Illuminate\Contracts\Config\Repository
      */

app/Console/Commands/Location/DeleteLocationCommand.php

@@ -35,6 +35,11 @@ class DeleteLocationCommand extends Command
      */
     protected $deletionService;
 
+    /**
+     * @var string
+     */
+    protected $description = 'Deletes a location from the Panel.';
+
     /**
      * @var \Illuminate\Support\Collection
      */

app/Console/Commands/User/MakeUserCommand.php

@@ -34,6 +34,11 @@ class MakeUserCommand extends Command
      */
     protected $creationService;
 
+    /**
+     * @var string
+     */
+    protected $description = 'Creates a user on the system via the CLI.';
+
     /**
      * @var string
      */

app/Http/Controllers/Admin/ServersController.php

@@ -226,6 +226,13 @@ class ServersController extends Controller
      */
     public function create()
     {
+        $nodes = $this->nodeRepository->all();
+        if (count($nodes) < 1) {
+            $this->alert->warning(trans('admin/server.alerts.node_required'))->flash();
+
+            return redirect()->route('admin.nodes');
+        }
+
         $services = $this->serviceRepository->getWithOptions();
 
         Javascript::put([

app/Models/Server.php

@@ -81,6 +81,8 @@ class Server extends Model implements CleansAttributes, ValidableContract
         'disk' => 'required',
         'service_id' => 'required',
         'option_id' => 'required',
+        'node_id' => 'required',
+        'allocation_id' => 'required',
         'pack_id' => 'sometimes',
         'auto_deploy' => 'sometimes',
         'custom_id' => 'sometimes',