From afca9c03cd37928c64f369bf99d7447c69c512b9 Mon Sep 17 00:00:00 2001 From: Josh North Date: Thu, 29 Jun 2017 16:14:00 -0400 Subject: [PATCH] Cleanup unnecessary functions --- AdminMail/src/AdminMail/EmailTask.php | 41 +++++++++++---------------- AdminMail/src/AdminMail/Main.php | 34 ++++------------------ 2 files changed, 22 insertions(+), 53 deletions(-) diff --git a/AdminMail/src/AdminMail/EmailTask.php b/AdminMail/src/AdminMail/EmailTask.php index 489698c..649c70b 100644 --- a/AdminMail/src/AdminMail/EmailTask.php +++ b/AdminMail/src/AdminMail/EmailTask.php @@ -14,32 +14,23 @@ use AdminMail\Main; class EmailTask extends PluginTask { + public function __construct(Main $main, string $adminmail, string $playername, string $adminsubject, string $adminmessage) { + parent::__construct($main); + $this->playername = $playername; + $this->adminmail = $adminmail; + $this->adminsubject = $adminsubject; + $this->adminmessage = $adminmessage; + } -public function __construct(Main $main, string $adminmail, string $playername, string $adminsubject, string $adminmessage) { - parent::__construct($main); - $this->playername = $playername; - $this->adminmail = $adminmail; - $this->adminsubject = $adminsubject; - $this->adminmessage = $adminmessage; - -} - -public function onRun($tick) { // - - $player = $this->getOwner()->getServer()->getPlayer($this->playername); + public function onRun($tick) { + $player = $this->getOwner()->getServer()->getPlayer($this->playername); $name = $player->getName(); + $admin = $this->adminmail; + $admin1 = $this->adminsubject; + $admin1 = str_replace("PNAME", $name, $admin1); + $admin2 = $this->adminmessage; + $admin2 = str_replace("PNAME", $name, $admin2); + mail($admin, $admin1, $admin2); + } - $admin = $this->adminmail; - $admin1 = $this->adminsubject; - $admin1 = str_replace("PNAME", $name, $admin1); - - $admin2 = $this->adminmessage; - $admin2 = str_replace("PNAME", $name, $admin2); - - -// $adminmail = $this->getConfig()->get("adminmail"); - - - mail($admin, $admin1, $admin2); -} } \ No newline at end of file diff --git a/AdminMail/src/AdminMail/Main.php b/AdminMail/src/AdminMail/Main.php index d0b8a4b..71284d7 100644 --- a/AdminMail/src/AdminMail/Main.php +++ b/AdminMail/src/AdminMail/Main.php @@ -10,44 +10,22 @@ use pocketmine\command\Command; use pocketmine\command\CommandSender; use pocketmine\utils\Config; - class Main extends PluginBase implements Listener { - - public function onLoad() { # Called when the plugin is being loaded by the server - $this->getLogger()->info("Loading plugin..."); # Logs to the console - } - - public function onEnable() { # Called when the plugin is enabled successfully without any errors - $this->getServer()->getPluginManager()->registerEvents($this, $this); # Registers the events + public function onEnable() { + $this->getServer()->getPluginManager()->registerEvents($this, $this); @mkdir($this->getDataFolder()); $this->saveDefaultConfig(); } - public function onDisable() { # Called when the plugin is being disabled - $this->getLogger()->info("Plugin disabled!"); # Logs to the console - } - - public function onCommand(CommandSender $sender, Command $cmd, $label, array $args) { # This is called when a player rans the command from this plugin - if($cmd->getName() == "example") { # Remove this if your plugin has only one command - $sender->sendMessage("This is an example command"); # Sends to the sender - } - } - - - - - public function onJoin(PlayerJoinEvent $event) { # Called when a player joins + public function onJoin(PlayerJoinEvent $event) { $player = $event->getPlayer(); $name = $player->getName(); $adminmail = $this->getConfig()->get("adminmail"); $adminsubject = $this->getConfig()->get("adminsubject"); $adminmessage = $this->getConfig()->get("adminmessage"); - - - //mail($adminmail, "PMMP - $name joined", "Hello, player $name has joined the server."); - //sleep(10); - $task = new EmailTask($this, $adminmail, $name, $adminsubject, $adminmessage); // Create the new class Task by calling - $this->getServer()->getScheduler()->scheduleDelayedTask($task, 5*20); // Counted in ticks (1 second = 20 ticks) + $task = new EmailTask($this, $adminmail, $name, $adminsubject, $adminmessage); + $this->getServer()->getScheduler()->scheduleDelayedTask($task, 5*20); } + } \ No newline at end of file