From 8ea0646064bbac739c74909fcc867f5ba09ccd8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Steffen=20Schro=CC=88der?= <schteffens@gmail.com>
Date: Wed, 7 May 2014 21:42:23 +0200
Subject: [PATCH] improved TheM plugins unload methods

---
 .../plugins/TheM/DynamicPointlimitPlugin.php      |  5 ++---
 application/plugins/TheM/QueuePlugin.php          | 15 ++++-----------
 application/plugins/TheM/TeamSpeakPlugin.php      |  6 +-----
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/application/plugins/TheM/DynamicPointlimitPlugin.php b/application/plugins/TheM/DynamicPointlimitPlugin.php
index b546eaf0..2717acbc 100644
--- a/application/plugins/TheM/DynamicPointlimitPlugin.php
+++ b/application/plugins/TheM/DynamicPointlimitPlugin.php
@@ -1,5 +1,7 @@
 <?php
+
 namespace TheM;
+
 use ManiaControl\Callbacks\CallbackListener;
 use ManiaControl\Commands\CommandListener;
 use ManiaControl\ManiaControl;
@@ -70,9 +72,6 @@ class DynamicPointlimitPlugin implements CallbackListener, CommandListener, Plug
 	 * Unload the plugin and its resources
 	 */
 	public function unload() {
-		$this->maniaControl->callbackManager->unregisterCallbackListener($this);
-
-		unset($this->maniaControl);
 	}
 
 	/**
diff --git a/application/plugins/TheM/QueuePlugin.php b/application/plugins/TheM/QueuePlugin.php
index 39d3a188..1bc14e88 100644
--- a/application/plugins/TheM/QueuePlugin.php
+++ b/application/plugins/TheM/QueuePlugin.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace TheM;
 
 use FML\Controls\Frame;
@@ -103,23 +104,16 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
 	 * Unload the plugin and its resources
 	 */
 	public function unload() {
-		$this->maniaControl->manialinkManager->unregisterManialinkPageAnswerListener($this);
-		$this->maniaControl->callbackManager->unregisterCallbackListener($this);
-		$this->maniaControl->timerManager->unregisterTimerListenings($this);
-
 		foreach($this->spectators as $spectator) {
 			$this->maniaControl->client->forceSpectator($spectator, 3);
 			$this->maniaControl->client->forceSpectator($spectator, 0);
 		}
 
-		foreach($this->maniaControl->playerManager->getPlayers() as $player) {
-			$this->hideQueueWidget($player);
-		}
+		$this->maniaControl->manialinkManager->hideManialink(self::ML_ID);
 
 		$this->queue      = array();
 		$this->spectators = array();
 		$this->showPlay   = array();
-		unset($this->maniaControl);
 	}
 
 	/**
@@ -566,7 +560,6 @@ class QueuePlugin implements CallbackListener, CommandListener, ManialinkPageAns
 	 * @param Player $player
 	 */
 	private function hideQueueWidget(Player $player) {
-		$maniaLink = new ManiaLink(self::ML_ID);
-		$this->maniaControl->manialinkManager->sendManialink($maniaLink, $player->login);
+		$this->maniaControl->manialinkManager->hideManialink(self::ML_ID, $player);
 	}
-}
\ No newline at end of file
+}
diff --git a/application/plugins/TheM/TeamSpeakPlugin.php b/application/plugins/TheM/TeamSpeakPlugin.php
index 1939efb8..81c6db09 100644
--- a/application/plugins/TheM/TeamSpeakPlugin.php
+++ b/application/plugins/TheM/TeamSpeakPlugin.php
@@ -1,4 +1,5 @@
 <?php
+
 namespace TheM;
 
 use FML\Controls\Frame;
@@ -126,11 +127,6 @@ class TeamSpeakPlugin implements CallbackListener, CommandListener, ManialinkPag
 		$this->serverData = array();
 
 		$this->maniaControl->actionsMenu->removeMenuItem(1, true);
-		$this->maniaControl->manialinkManager->unregisterManialinkPageAnswerListener($this);
-		$this->maniaControl->callbackManager->unregisterCallbackListener($this);
-		$this->maniaControl->commandManager->unregisterCommandListener($this);
-		$this->maniaControl->timerManager->unregisterTimerListenings($this);
-		unset($this->maniaControl);
 	}
 
 	/**