mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-09 13:14:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.1'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-07-09 18:44:55 +01:00
commit 80ebc0bc5f
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/Player.php
View File

@ -3171,12 +3171,14 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
* *
* @param string $reason * @param string $reason
* @param bool $isAdmin * @param bool $isAdmin
* @param TextContainer|string $quitMessage
* *
* @return bool * @return bool
*/ */
public function kick(string $reason = "", bool $isAdmin = true) : bool{ public function kick(string $reason = "", bool $isAdmin = true, $quitMessage = null) : bool{
$this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, $this->getLeaveMessage())); $this->server->getPluginManager()->callEvent($ev = new PlayerKickEvent($this, $reason, $quitMessage ?? $this->getLeaveMessage()));
if(!$ev->isCancelled()){ if(!$ev->isCancelled()){
$reason = $ev->getReason();
$message = $reason; $message = $reason;
if($isAdmin){ if($isAdmin){
if(!$this->isBanned()){ if(!$this->isBanned()){

7
src/pocketmine/event/player/PlayerKickEvent.php
View File

@ -50,6 +50,13 @@ class PlayerKickEvent extends PlayerEvent implements Cancellable{
$this->reason = $reason; $this->reason = $reason;
} }
/**
* @param string $reason
*/
public function setReason(string $reason) : void{
$this->reason = $reason;
}
public function getReason() : string{ public function getReason() : string{
return $this->reason; return $this->reason;
} }