removed unregister calls from plugin unload methods

This commit is contained in:
Steffen Schröder 2014-05-03 23:09:38 +02:00
parent f9b6437970
commit 3f1339129c
11 changed files with 6 additions and 43 deletions

View File

@ -287,7 +287,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
$this->fetchDedimaniaRecords(true); $this->fetchDedimaniaRecords(true);
} }
/** /**
* Handle EndMap callback * Handle EndMap callback
* *
@ -1144,9 +1143,6 @@ class Dedimania implements CallbackListener, CommandListener, TimerListener, Plu
* Unload the plugin and its resources * Unload the plugin and its resources
*/ */
public function unload() { public function unload() {
$this->maniaControl->timerManager->unregisterTimerListenings($this);
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -26,11 +26,9 @@ class ChatMessagePlugin implements CommandListener, Plugin {
const SETTING_AFK_FORCE_SPEC = 'AFK command forces spec'; const SETTING_AFK_FORCE_SPEC = 'AFK command forces spec';
/** /**
* Private properties * Private Properties
*/
/**
* @var maniaControl $maniaControl
*/ */
/** @var maniaControl $maniaControl */
private $maniaControl = null; private $maniaControl = null;
/** /**
@ -124,8 +122,6 @@ class ChatMessagePlugin implements CommandListener, Plugin {
* Unload the plugin and its resources * Unload the plugin and its resources
*/ */
public function unload() { public function unload() {
$this->maniaControl->commandManager->unregisterCommandListener($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -74,7 +74,7 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
const CB_CUSTOM_VOTE_FINISHED = 'CustomVotesPlugin.CustomVoteFinished'; const CB_CUSTOM_VOTE_FINISHED = 'CustomVotesPlugin.CustomVoteFinished';
/** /**
* Private properties * Private Properties
*/ */
/** @var maniaControl $maniaControl */ /** @var maniaControl $maniaControl */
private $maniaControl = null; private $maniaControl = null;
@ -191,13 +191,7 @@ class CustomVotesPlugin implements CommandListener, CallbackListener, ManialinkP
$this->maniaControl->client->setCallVoteRatiosEx(false, $ratioArray); $this->maniaControl->client->setCallVoteRatiosEx(false, $ratioArray);
$this->destroyVote(); $this->destroyVote();
$emptyManialink = new ManiaLink(self::MLID_ICON); $this->maniaControl->manialinkManager->hideManialink(self::MLID_ICON);
$this->maniaControl->manialinkManager->sendManialink($emptyManialink);
$this->maniaControl->commandManager->unregisterCommandListener($this);
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->manialinkManager->unregisterManialinkPageAnswerListener($this);
$this->maniaControl->timerManager->unregisterTimerListenings($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -109,12 +109,7 @@ class DonationPlugin implements CallbackListener, CommandListener, Plugin {
* @see \ManiaControl\Plugins\Plugin::unload() * @see \ManiaControl\Plugins\Plugin::unload()
*/ */
public function unload() { public function unload() {
$emptyManialink = new ManiaLink(self::MLID_DONATE_WIDGET); $this->maniaControl->manialinkManager->hideManialink(self::MLID_DONATE_WIDGET);
$this->maniaControl->manialinkManager->sendManialink($emptyManialink);
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->commandManager->unregisterCommandListener($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -384,9 +384,6 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
*/ */
public function unload() { public function unload() {
$this->maniaControl->manialinkManager->hideManialink(self::MLID_KARMA); $this->maniaControl->manialinkManager->hideManialink(self::MLID_KARMA);
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->timerManager->unregisterTimerListenings($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -116,8 +116,6 @@ class LocalRecordsPlugin implements CallbackListener, CommandListener, TimerList
* @see \ManiaControl\Plugins\Plugin::unload() * @see \ManiaControl\Plugins\Plugin::unload()
*/ */
public function unload() { public function unload() {
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->timerManager->unregisterTimerListenings($this);
} }
/** /**

View File

@ -112,11 +112,9 @@ class ServerRankingPlugin implements Plugin, CallbackListener, CommandListener {
} }
/** /**
* Unload the plugin and its resources * @see \ManiaControl\Plugins\Plugin::unload()
*/ */
public function unload() { public function unload() {
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->commandManager->unregisterCommandListener($this);
} }
/** /**

View File

@ -423,9 +423,6 @@ class WidgetPlugin implements CallbackListener, TimerListener, Plugin {
$this->closeWidget(self::MLID_SERVERINFOWIDGET); $this->closeWidget(self::MLID_SERVERINFOWIDGET);
$this->closeWidget(self::MLID_MAPWIDGET); $this->closeWidget(self::MLID_MAPWIDGET);
$this->closeWidget(self::MLID_NEXTMAPWIDGET); $this->closeWidget(self::MLID_NEXTMAPWIDGET);
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->timerManager->unregisterTimerListenings($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -91,8 +91,6 @@ class ChatlogPlugin implements CallbackListener, Plugin {
* @see \ManiaControl\Plugins\Plugin::unload() * @see \ManiaControl\Plugins\Plugin::unload()
*/ */
public function unload() { public function unload() {
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -62,9 +62,6 @@ class EndurancePlugin implements CallbackListener, Plugin {
* @see \ManiaControl\Plugins\Plugin::unload() * @see \ManiaControl\Plugins\Plugin::unload()
*/ */
public function unload() { public function unload() {
$this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->callbackManager->unregisterScriptCallbackListener($this);
unset($this->maniaControl);
} }
/** /**

View File

@ -70,9 +70,6 @@ class ObstaclePlugin implements CallbackListener, CommandListener, Plugin {
* @see \ManiaControl\Plugins\Plugin::unload() * @see \ManiaControl\Plugins\Plugin::unload()
*/ */
public function unload() { public function unload() {
$this->maniaControl->commandManager->unregisterCommandListener($this);
$this->maniaControl->callbackManager->unregisterScriptCallbackListener($this);
unset($this->maniaControl);
} }
/** /**