mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-07 02:08:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge changes from master

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-05-24 09:54:11 +01:00
parent 8cc1003956 92281da514
commit af06d78725
10 changed files with 67 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/entity/Entity.php
View File

@ -76,7 +76,7 @@ abstract class Entity extends Location implements Metadatable{
const DATA_FLAGS = 0;
const DATA_HEALTH = 1; //int (minecart/boat)
const DATA_VARIANT = 2; //int
const DATA_COLOUR = 3; //byte
const DATA_COLOR = 3, DATA_COLOUR = 3; //byte
const DATA_NAMETAG = 4; //string
const DATA_OWNER_EID = 5; //long
const DATA_TARGET_EID = 6; //long

3
src/pocketmine/entity/FallingSand.php
View File

@ -112,7 +112,8 @@ class FallingSand extends Entity{
if($this->onGround){
$this->kill();
$block = $this->level->getBlock($pos);
if($block->getId() > 0 and !$block->isSolid() and !($block instanceof Liquid)){
if($block->getId() > 0 and $block->isTransparent() and !$block->canBeReplaced()){
//FIXME: anvils are supposed to destroy torches
$this->getLevel()->dropItem($this, ItemItem::get($this->getBlock(), $this->getDamage(), 1));
}else{
$this->server->getPluginManager()->callEvent($ev = new EntityBlockChangeEvent($this, $block, Block::get($this->getBlock(), $this->getDamage())));