Merge branch master

This commit is contained in:
PEMapModder
2016-02-22 14:32:37 +08:00
21 changed files with 98 additions and 60 deletions

View File

@ -69,7 +69,7 @@ class CraftItemEvent extends Event implements Cancellable{
}
/**
* @return \pocktemine\Player
* @return \pocketmine\Player
*/
public function getPlayer(){
return $this->player;

View File

@ -83,4 +83,11 @@ abstract class PlayerBucketEvent extends PlayerEvent implements Cancellable{
public function getBlockClicked(){
return $this->blockClicked;
}
}
/**
* @return int
*/
public function getBlockFace(){
return $this->blockFace;
}
}

View File

@ -34,8 +34,8 @@ class PlayerDeathEvent extends EntityDeathEvent{
private $keepInventory = false;
/**
* @param Player $entity
* @param Item[] $drops
* @param Player $entity
* @param Item[] $drops
* @param string|TextContainer $deathMessage
*/
public function __construct(Player $entity, array $drops, $deathMessage){
@ -50,6 +50,13 @@ class PlayerDeathEvent extends EntityDeathEvent{
return $this->entity;
}
/**
* @return Player
*/
public function getPlayer(){
return $this->entity;
}
/**
* @return TextContainer|string
*/