From 31b92b392e92d222d488fc134172b1f0bd99dcf6 Mon Sep 17 00:00:00 2001 From: Shoghi Cervantes Date: Fri, 15 Aug 2014 16:15:12 +0200 Subject: [PATCH] Throw invalid event exception when a plugin tries to declare an abstract event --- src/pocketmine/Server.php | 2 +- src/pocketmine/plugin/PluginManager.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pocketmine/Server.php b/src/pocketmine/Server.php index 6f45109fe..74a226e63 100644 --- a/src/pocketmine/Server.php +++ b/src/pocketmine/Server.php @@ -2008,7 +2008,7 @@ class Server{ $this->scheduler->scheduleAsyncTask($this->lastSendUsage); } - public function titleTick(){ + private function titleTick(){ if(defined("pocketmine\\DEBUG") and \pocketmine\DEBUG >= 0 and \pocketmine\ANSI === true){ echo "\x1b]0;PocketMine-MP " . $this->getPocketMineVersion() . " | Online " . count($this->players) . "/" . $this->getMaxPlayers() . " | RAM " . round((memory_get_usage() / 1024) / 1024, 2) . "/" . round((memory_get_usage(true) / 1024) / 1024, 2) . " MB | U ". round($this->mainInterface->getUploadUsage() / 1024, 2) ." D ". round($this->mainInterface->getDownloadUsage() / 1024, 2) ." kB/s | TPS " . $this->getTicksPerSecond() . "\x07"; } diff --git a/src/pocketmine/plugin/PluginManager.php b/src/pocketmine/plugin/PluginManager.php index 1f3186228..f9f91d531 100644 --- a/src/pocketmine/plugin/PluginManager.php +++ b/src/pocketmine/plugin/PluginManager.php @@ -704,7 +704,7 @@ class PluginManager{ * @throws \Exception */ public function registerEvent($event, Listener $listener, $priority, EventExecutor $executor, Plugin $plugin, $ignoreCancelled = false){ - if(!is_subclass_of($event, "pocketmine\\event\\Event")){ + if(!is_subclass_of($event, "pocketmine\\event\\Event") or (new \ReflectionClass($event))->isAbstract()){ throw new \Exception($event . " is not a valid Event"); }