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

Merge branch 'release/3.1' into release/3.2

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-09-20 16:49:57 +01:00
commit 33d3fff3c5
5 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pocketmine/PocketMine.php
View File

@ -145,12 +145,18 @@ namespace pocketmine {
define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR); define('pocketmine\PATH', dirname(__FILE__, 3) . DIRECTORY_SEPARATOR);
} }
define('pocketmine\COMPOSER_AUTOLOADER_PATH', \pocketmine\PATH . 'vendor/autoload.php'); $opts = getopt("", ["bootstrap:"]);
if(isset($opts["bootstrap"])){
$bootstrap = $opts["bootstrap"];
}else{
$bootstrap = \pocketmine\PATH . 'vendor/autoload.php';
}
define('pocketmine\COMPOSER_AUTOLOADER_PATH', realpath($bootstrap));
if(is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){ if(\pocketmine\COMPOSER_AUTOLOADER_PATH !== false and is_file(\pocketmine\COMPOSER_AUTOLOADER_PATH)){
require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH); require_once(\pocketmine\COMPOSER_AUTOLOADER_PATH);
}else{ }else{
critical_error("Composer autoloader not found."); critical_error("Composer autoloader not found at " . $bootstrap);
critical_error("Please install/update Composer dependencies or use provided builds."); critical_error("Please install/update Composer dependencies or use provided builds.");
exit(1); exit(1);
} }

2
src/pocketmine/block/Cake.php
View File

@ -35,6 +35,8 @@ class Cake extends Transparent implements FoodSource{
protected $id = self::CAKE_BLOCK; protected $id = self::CAKE_BLOCK;
protected $itemId = Item::CAKE;
public function __construct(int $meta = 0){ public function __construct(int $meta = 0){
$this->meta = $meta; $this->meta = $meta;
} }

4
src/pocketmine/block/Farmland.php
View File

@ -111,4 +111,8 @@ class Farmland extends Transparent{
public function isAffectedBySilkTouch() : bool{ public function isAffectedBySilkTouch() : bool{
return false; return false;
} }
public function getPickedItem() : Item{
return ItemFactory::get(Item::DIRT);
}
} }

3
src/pocketmine/block/RedstoneOre.php
View File

@ -50,7 +50,8 @@ class RedstoneOre extends Solid{
} }
public function onActivate(Item $item, Player $player = null) : bool{ public function onActivate(Item $item, Player $player = null) : bool{
return $this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta)); $this->getLevel()->setBlock($this, BlockFactory::get(Block::GLOWING_REDSTONE_ORE, $this->meta));
return false; //this shouldn't prevent block placement
} }
public function onNearbyBlockChange() : void{ public function onNearbyBlockChange() : void{

14
src/pocketmine/block/Skull.php
View File

@ -71,18 +71,20 @@ class Skull extends Flowable{
return true; return true;
} }
public function getDropsForCompatibleTool(Item $item) : array{ private function getItem() : Item{
$tile = $this->level->getTile($this); $tile = $this->level->getTile($this);
if($tile instanceof TileSkull){ return ItemFactory::get(Item::SKULL, $tile instanceof TileSkull ? $tile->getType() : 0);
return [
ItemFactory::get(Item::SKULL, $tile->getType())
];
} }
return []; public function getDropsForCompatibleTool(Item $item) : array{
return [$this->getItem()];
} }
public function isAffectedBySilkTouch() : bool{ public function isAffectedBySilkTouch() : bool{
return false; return false;
} }
public function getPickedItem() : Item{
return $this->getItem();
}
} }