mirror of
https://github.com/pmmp/PocketMine-MP.git
synced 2025-09-09 11:16:57 +00:00
Merge branch 'minor-next' into major-next
This commit is contained in:
@ -24,8 +24,8 @@ declare(strict_types=1);
|
||||
namespace pocketmine\block;
|
||||
|
||||
use pocketmine\block\utils\BlockEventHelper;
|
||||
use pocketmine\block\utils\MultiAnyFacing;
|
||||
use pocketmine\block\utils\MultiAnySupportTrait;
|
||||
use pocketmine\block\utils\MultiFacing;
|
||||
use pocketmine\block\utils\SupportType;
|
||||
use pocketmine\item\Fertilizer;
|
||||
use pocketmine\item\Item;
|
||||
@ -36,7 +36,7 @@ use pocketmine\world\World;
|
||||
use function count;
|
||||
use function shuffle;
|
||||
|
||||
class GlowLichen extends Transparent implements MultiFacing{
|
||||
class GlowLichen extends Transparent implements MultiAnyFacing{
|
||||
use MultiAnySupportTrait;
|
||||
|
||||
public function getLightLevel() : int{
|
||||
|
@ -23,11 +23,11 @@ declare(strict_types=1);
|
||||
|
||||
namespace pocketmine\block;
|
||||
|
||||
use pocketmine\block\utils\MultiAnyFacing;
|
||||
use pocketmine\block\utils\MultiAnySupportTrait;
|
||||
use pocketmine\block\utils\MultiFacing;
|
||||
use pocketmine\block\utils\SupportType;
|
||||
|
||||
final class ResinClump extends Transparent implements MultiFacing{
|
||||
final class ResinClump extends Transparent implements MultiAnyFacing{
|
||||
use MultiAnySupportTrait;
|
||||
|
||||
public function isSolid() : bool{
|
||||
|
@ -27,7 +27,10 @@ interface Ageable{
|
||||
|
||||
public function getAge() : int;
|
||||
|
||||
public function getMaxAge() : int;
|
||||
|
||||
/**
|
||||
* Must be in range 0 - getMaxAge()
|
||||
* @return $this
|
||||
*/
|
||||
public function setAge(int $age) : self;
|
||||
|
@ -38,6 +38,8 @@ trait AgeableTrait{
|
||||
|
||||
public function getAge() : int{ return $this->age; }
|
||||
|
||||
public function getMaxAge() : int{ return self::MAX_AGE; }
|
||||
|
||||
/**
|
||||
* @return $this
|
||||
*/
|
||||
|
@ -25,7 +25,7 @@ namespace pocketmine\block\utils;
|
||||
|
||||
use pocketmine\math\Facing;
|
||||
|
||||
interface MultiFacing{
|
||||
interface MultiAnyFacing{
|
||||
|
||||
/**
|
||||
* @return int[]
|
Reference in New Issue
Block a user