Merge branch 'stable'

# Conflicts:
#	resources/vanilla
#	src/pocketmine/entity/Human.php
This commit is contained in:
Dylan K. Taylor
2019-05-17 17:43:30 +01:00
3 changed files with 61 additions and 33 deletions

View File

@ -70,10 +70,7 @@ class PlayerChangeSkinEvent extends PlayerEvent implements Cancellable{
* @throws \InvalidArgumentException if the specified skin is not valid
*/
public function setNewSkin(Skin $skin) : void{
if(!$skin->isValid()){
throw new \InvalidArgumentException("Skin format is invalid");
}
$skin->validate();
$this->newSkin = $skin;
}
}