From b42222c4619f57de2a2ecfd778dc7a14c08fa04e Mon Sep 17 00:00:00 2001 From: Michael Yoo Date: Mon, 15 Jul 2013 12:08:28 +0900 Subject: [PATCH] Better Command Permissions Check --- src/API/BanAPI.php | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/API/BanAPI.php b/src/API/BanAPI.php index c4be3b7b..ce0a9eea 100644 --- a/src/API/BanAPI.php +++ b/src/API/BanAPI.php @@ -52,7 +52,8 @@ class BanAPI{ $this->server->api->console->alias("banlist", "ban list"); $this->server->api->console->alias("pardon", "ban remove"); $this->server->api->console->alias("pardon-ip", "banip remove"); - $this->server->addHandler("console.command", array($this, "permissionsCheck"), 1);//Event handler when commands are issued. Used to check permissions of commands that go through the server. + $this->server->addHandler("console.command", array($this, "permissionsCheck"), 1); + $this->server->addHandler("console.check", array($this, "permissionsCheck"), 1);//Event handler when commands are issued. Used to check permissions of commands that go through the server. $this->server->addHandler("player.block.break", array($this, "permissionsCheck"), 1);//Event handler for blocks $this->server->addHandler("player.block.place", array($this, "permissionsCheck"), 1);//Event handler for blocks $this->server->addHandler("player.flying", array($this, "permissionsCheck"), 1);//Flying Event @@ -96,14 +97,20 @@ class BanAPI{ } if($data["issuer"] instanceof Player){ - if($this->server->api->handle("console.check", $data) === true or $this->isOp($data["issuer"]->iusername)){ + if($this->server->api->handle("console.check", $data) === true){ return; } }elseif($data["issuer"] === "console" or $data["issuer"] === "rcon"){ return; } return false; - break; + break; + case "console.check": + if($this->isOp($data["issuer"]->iusername)) + return true; + else + return false; + break; } }