From 736c233e7658806815210f8e7e162ab90d9ac53e Mon Sep 17 00:00:00 2001 From: Wies Date: Tue, 3 Dec 2013 18:26:38 +0100 Subject: [PATCH 1/2] Allow chat plugins to work with eachother --- src/Player.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Player.php b/src/Player.php index f1551570..2845ae5a 100644 --- a/src/Player.php +++ b/src/Player.php @@ -1922,8 +1922,9 @@ class Player{ if($message{0} === "/"){ //Command $this->server->api->console->run(substr($message, 1), $this); }else{ - if($this->server->api->dhandle("player.chat", array("player" => $this, "message" => $message)) !== false){ - $this->server->api->chat->send($this, $message); + $data = array("player" => $this, "message" => $message); + if($this->server->api->handle("player.chat", $data) !== false){ + $this->server->api->chat->send($this, $data["message"]); } } } From adcf95f4868a8ddd853fd29103b456c63325eb4a Mon Sep 17 00:00:00 2001 From: Wies Date: Tue, 3 Dec 2013 18:33:37 +0100 Subject: [PATCH 2/2] Fix Send the normal message when $data["message"] is removed by a plugin. --- src/Player.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Player.php b/src/Player.php index 2845ae5a..67a718d2 100644 --- a/src/Player.php +++ b/src/Player.php @@ -1924,7 +1924,11 @@ class Player{ }else{ $data = array("player" => $this, "message" => $message); if($this->server->api->handle("player.chat", $data) !== false){ - $this->server->api->chat->send($this, $data["message"]); + if(isset($data["message"])){ + $this->server->api->chat->send($this, $data["message"]); + }else{ + $this->server->api->chat->send($this, $message); + } } } }