diff --git a/core/Callbacks/Structures/BaseStructure.php b/core/Callbacks/Structures/BaseStructure.php index e277c365..59a8ebfd 100644 --- a/core/Callbacks/Structures/BaseStructure.php +++ b/core/Callbacks/Structures/BaseStructure.php @@ -16,13 +16,9 @@ abstract class BaseStructure { protected $maniaControl; private $plainJson; - /** - * Sets ManiaControl - * - * @param \ManiaControl\ManiaControl $maniaControl - */ - protected function setManiaControl(ManiaControl $maniaControl) { + protected function __construct(ManiaControl $maniaControl, $data) { $this->maniaControl = $maniaControl; + $this->setJson($data); } /** @@ -45,7 +41,7 @@ abstract class BaseStructure { * Var_Dump the Structure */ public function dump() { - var_dump("Class Name including Namespace: " . get_class($this)); var_dump(json_decode(json_encode($this))); + var_dump("Class Name including Namespace: " . get_class($this)); } } \ No newline at end of file diff --git a/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php b/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php index 90975fc1..89461340 100644 --- a/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php +++ b/core/Callbacks/Structures/ManiaPlanet/StartServerStructure.php @@ -8,8 +8,8 @@ use ManiaControl\ManiaControl; class StartServerStructure extends BaseStructure { public function __construct(ManiaControl $maniaControl, $data) { - parent::setManiaControl($maniaControl); - parent::setJson($data); + parent::__construct($maniaControl, $data); + } } \ No newline at end of file diff --git a/core/Callbacks/Structures/ShootMania/DefaultEventStructure.php b/core/Callbacks/Structures/ShootMania/DefaultEventStructure.php index 84506526..71d68f6a 100644 --- a/core/Callbacks/Structures/ShootMania/DefaultEventStructure.php +++ b/core/Callbacks/Structures/ShootMania/DefaultEventStructure.php @@ -15,8 +15,7 @@ use ManiaControl\ManiaControl; */ class DefaultEventStructure extends BaseStructure { public function __construct(ManiaControl $maniaControl, $data) { - parent::setManiaControl($maniaControl); - parent::setJson($data); + parent::__construct($maniaControl, $data); } } \ No newline at end of file diff --git a/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php b/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php index 8e66ad20..34fa968c 100644 --- a/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php +++ b/core/Callbacks/Structures/Trackmania/DefaultEventStructure.php @@ -15,8 +15,7 @@ use ManiaControl\ManiaControl; */ class DefaultEventStructure extends BaseStructure { public function __construct(ManiaControl $maniaControl, $data) { - parent::setManiaControl($maniaControl); - parent::setJson($data); + parent::__construct($maniaControl, $data); } } \ No newline at end of file diff --git a/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php b/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php index 018b0b91..a1b8d992 100644 --- a/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php +++ b/core/Callbacks/Structures/XmlRpc/CallbacksListStructure.php @@ -25,11 +25,12 @@ class CallbacksListStructure extends BaseStructure { * @param array $data */ public function __construct(ManiaControl $maniaControl, $data) { - parent::setManiaControl($maniaControl); - parent::setJson($data); + parent::__construct($maniaControl, $data); $this->responseId = $this->getJson()->responseid; $this->callbacks = $this->getJson()->callbacks; + + $this->dump(); } /**