From bd238c7555ce8f74cbf7f71125fbb855f13daf65 Mon Sep 17 00:00:00 2001
From: Dane Everitt <dane@daneeveritt.com>
Date: Mon, 8 Jan 2018 23:03:14 -0600
Subject: [PATCH] No more OOME checkboxes

---
 CHANGELOG.md                                          |  5 ++++-
 app/Services/Servers/ServerCreationService.php        |  2 +-
 .../themes/pterodactyl/admin/servers/new.blade.php    | 11 +----------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22629eb2b..1bbceffb4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,7 +18,10 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 
 ### Changed
 * Changed behavior of allocation IP Address/Ports box to automatically store the value entered if a user unfocuses the field without hitting space.
-* c order in which allocations are displayed to prioritize those with servers attached (in ascending IP & port order) followed by ascending IP & port order where no server is attached.
+* Changed order in which allocations are displayed to prioritize those with servers attached (in ascending IP & port order) followed by ascending IP & port order where no server is attached.
+
+### Removed
+* OOM exceptions can no longer be disabled on servers due to a startling number of users that were using it to avoid allocating proper amounts of resources to servers.
 
 ## v0.7.0-beta.3 (Derelict Dermodactylus)
 ### Fixed
diff --git a/app/Services/Servers/ServerCreationService.php b/app/Services/Servers/ServerCreationService.php
index 4395717ec..1859ec77a 100644
--- a/app/Services/Servers/ServerCreationService.php
+++ b/app/Services/Servers/ServerCreationService.php
@@ -127,7 +127,7 @@ class ServerCreationService
             'disk' => array_get($data, 'disk'),
             'io' => array_get($data, 'io'),
             'cpu' => array_get($data, 'cpu'),
-            'oom_disabled' => isset($data['oom_disabled']),
+            'oom_disabled' => false,
             'allocation_id' => array_get($data, 'allocation_id'),
             'nest_id' => array_get($data, 'nest_id'),
             'egg_id' => array_get($data, 'egg_id'),
diff --git a/resources/themes/pterodactyl/admin/servers/new.blade.php b/resources/themes/pterodactyl/admin/servers/new.blade.php
index 09c14fcec..bbed3de6c 100644
--- a/resources/themes/pterodactyl/admin/servers/new.blade.php
+++ b/resources/themes/pterodactyl/admin/servers/new.blade.php
@@ -121,18 +121,9 @@
                             <span class="input-group-addon">MB</span>
                         </div>
                     </div>
-                    <div class="form-group col-sm-4">
-                        <label for="pOOMDisabled">Out-of-Memory Killer</label>
-                        <div class="input-group">
-                            <span class="input-group-addon">
-                                <input type="checkbox" id="pOOMDisabled" name="oom_disabled"/>
-                            </span>
-                            <input type="text" class="form-control" readonly style="background:transparent !important;" value="Disable OOM Killer" />
-                        </div>
-                    </div>
                 </div>
                 <div class="box-footer no-border no-pad-top no-pad-bottom">
-                    <p class="text-muted small">If you do not want to assign swap space to a server simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server simply enter <code>0</code> into the memory field. We suggest leaving OOM Killer enabled unless you know what you are doing, disabling it could cause your server to hang unexpectedly.<p>
+                    <p class="text-muted small">If you do not want to assign swap space to a server simply put <code>0</code> for the value, or <code>-1</code> to allow unlimited swap space. If you want to disable memory limiting on a server simply enter <code>0</code> into the memory field.<p>
                 </div>
                 <div class="box-body row">
                     <div class="form-group col-sm-4">