From c96bad4080fcedb34add24e9e64a51c6115f5d6b Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Sun, 22 Dec 2019 15:08:11 -0800
Subject: [PATCH] FIx force deletion

---
 app/Services/Servers/ServerDeletionService.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/Services/Servers/ServerDeletionService.php b/app/Services/Servers/ServerDeletionService.php
index 83a936054..d4ce9a896 100644
--- a/app/Services/Servers/ServerDeletionService.php
+++ b/app/Services/Servers/ServerDeletionService.php
@@ -4,7 +4,6 @@ namespace Pterodactyl\Services\Servers;
 
 use Psr\Log\LoggerInterface;
 use Pterodactyl\Models\Server;
-use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
 use Pterodactyl\Repositories\Eloquent\ServerRepository;
 use Pterodactyl\Repositories\Eloquent\DatabaseRepository;
@@ -100,17 +99,11 @@ class ServerDeletionService
     {
         try {
             $this->daemonServerRepository->setServer($server)->delete();
-        } catch (RequestException $exception) {
-            $response = $exception->getResponse();
-
-            if (is_null($response) || (! is_null($response) && $response->getStatusCode() !== 404)) {
-                // If not forcing the deletion, throw an exception, otherwise just log it and
-                // continue with server deletion process in the panel.
-                if (! $this->force) {
-                    throw new DaemonConnectionException($exception);
-                } else {
-                    $this->writer->warning($exception);
-                }
+        } catch (DaemonConnectionException $exception) {
+            if ($this->force) {
+                $this->writer->warning($exception);
+            } else {
+                throw $exception;
             }
         }