Fix egg copy from, closes pterodactyl#995

Author: DaneEveritt

CHANGELOG.md

@@ -7,6 +7,7 @@ This project follows [Semantic Versioning](http://semver.org) guidelines.
 ### Fixed
 * Fixes a UI error when attempting to change the default Nest and Egg for an existing server.
 * Correct permissions check in UI to allow subusers with permission to `view-allocations` the ability to actually see the sidebar link.
+* Fixes improper behavior when marking an egg as copying the configuration from another.
 
 ### Changed
 * Panel now throws proper 504: Gateway Timeout errors on server listing when daemon is offline.

app/Models/Egg.php

@@ -113,7 +113,11 @@ class Egg extends Model implements CleansAttributes, ValidableContract
      */
     public function getCopyScriptInstallAttribute()
     {
-        return (is_null($this->copy_script_from)) ? $this->script_install : $this->scriptFrom->script_install;
+        if (! is_null($this->script_install) || is_null($this->copy_script_from)) {
+            return $this->script_install;
+        }
+
+        return $this->scriptFrom->script_install;
     }
 
     /**
@@ -124,7 +128,11 @@ public function getCopyScriptInstallAttribute()
      */
     public function getCopyScriptEntryAttribute()
     {
-        return (is_null($this->copy_script_from)) ? $this->script_entry : $this->scriptFrom->script_entry;
+        if (! is_null($this->script_entry) || is_null($this->copy_script_from)) {
+            return $this->script_entry;
+        }
+
+        return $this->scriptFrom->script_entry;
     }
 
     /**
@@ -135,7 +143,11 @@ public function getCopyScriptEntryAttribute()
      */
     public function getCopyScriptContainerAttribute()
     {
-        return (is_null($this->copy_script_from)) ? $this->script_container : $this->scriptFrom->script_container;
+        if (! is_null($this->script_container) || is_null($this->copy_script_from)) {
+            return $this->script_container;
+        }
+
+        return $this->scriptFrom->script_container;
     }
 
     /**
@@ -145,7 +157,11 @@ public function getCopyScriptContainerAttribute()
      */
     public function getInheritConfigFilesAttribute()
     {
-        return is_null($this->config_from) ? $this->config_files : $this->configFrom->config_files;
+        if (! is_null($this->config_files) || is_null($this->config_from)) {
+            return $this->config_files;
+        }
+
+        return $this->configFrom->config_files;
     }
 
     /**
@@ -155,7 +171,11 @@ public function getInheritConfigFilesAttribute()
      */
     public function getInheritConfigStartupAttribute()
     {
-        return is_null($this->config_from) ? $this->config_startup : $this->configFrom->config_startup;
+        if (! is_null($this->config_startup) || is_null($this->config_from)) {
+            return $this->config_startup;
+        }
+
+        return $this->configFrom->config_startup;
     }
 
     /**
@@ -165,7 +185,11 @@ public function getInheritConfigStartupAttribute()
      */
     public function getInheritConfigLogsAttribute()
     {
-        return is_null($this->config_from) ? $this->config_logs : $this->configFrom->config_logs;
+        if (! is_null($this->config_logs) || is_null($this->config_from)) {
+            return $this->config_logs;
+        }
+
+        return $this->configFrom->config_logs;
     }
 
     /**
@@ -175,7 +199,11 @@ public function getInheritConfigLogsAttribute()
      */
     public function getInheritConfigStopAttribute()
     {
-        return is_null($this->config_from) ? $this->config_stop : $this->configFrom->config_stop;
+        if (! is_null($this->config_stop) || is_null($this->config_from)) {
+            return $this->config_stop;
+        }
+
+        return $this->configFrom->config_stop;
     }
 
     /**