diff --git a/src/material/block/attachable/Torch.php b/src/material/block/attachable/Torch.php index 25c51e39..c9594da2 100644 --- a/src/material/block/attachable/Torch.php +++ b/src/material/block/attachable/Torch.php @@ -59,7 +59,7 @@ class TorchBlock extends FlowableBlock{ $this->meta = $faces[$face]; $this->level->setBlock($block, $this, true, false, true); return true; - }elseif($this->getSide(0)->isTransparent === false or $this->getSide(0)->getID() === FENCE){ + }elseif($this->getSide(0)->isTransparent === false or $this->getSide(0)->getID() === FENCE or $this->getSide(0)->getID() === STONE_WALL){ $this->meta = 0; $this->level->setBlock($block, $this, true, false, true); return true; diff --git a/src/material/block/attachable/Trapdoor.php b/src/material/block/attachable/Trapdoor.php index 53b66611..1776a81d 100644 --- a/src/material/block/attachable/Trapdoor.php +++ b/src/material/block/attachable/Trapdoor.php @@ -39,9 +39,6 @@ class TrapdoorBlock extends TransparentBlock{ 5 => 3, ); $this->meta = $faces[$face] & 0x03; - if($fy > 0.5){ - $this->meta |= 0x08; - } $this->level->setBlock($block, $this, true, false, true); return true; } @@ -51,6 +48,26 @@ class TrapdoorBlock extends TransparentBlock{ array($this->id, 0, 1), ); } + public function onUpdate($type){ + if($type === BLOCK_UPDATE_NORMAL){ + $faces = array( //meta => side + 0 => 3, + 4 => 3, //activated + 1 => 2, + 5 => 2, //activated + 2 => 5, + 6 => 5, //activated + 3 => 4, + 7 => 4, //activated + ); + $side = $faces[$this->meta]; + if($this->getSide($side) instanceof AirBlock){ //Replace with common break method + ServerAPI::request()->api->entity->drop($this, BlockAPI::getItem($this->id, 0, 1)); + $this->level->setBlock($this, new AirBlock(), true, false, true); + return BLOCK_UPDATE_NORMAL; + } + } + } public function onActivate(Item $item, Player $player){ $this->meta ^= 0x04; $this->level->setBlock($this, $this, true, false, true); diff --git a/src/material/block/solid/Ice.php b/src/material/block/solid/Ice.php index a86d9ffb..d128775c 100644 --- a/src/material/block/solid/Ice.php +++ b/src/material/block/solid/Ice.php @@ -28,6 +28,7 @@ class IceBlock extends TransparentBlock{ public function onBreak(Item $item, Player $player){ if(($player->gamemode & 0x01) === 0){ $this->level->setBlock($this, new WaterBlock(), true, false, true); + ServerAPI::request()->api->block->scheduleBlockUpdate(clone $this, 10, BLOCK_UPDATE_NORMAL); }else{ $this->level->setBlock($this, new AirBlock(), true, false, true); } diff --git a/src/world/Entity.php b/src/world/Entity.php index a7aa6b15..92d053ab 100644 --- a/src/world/Entity.php +++ b/src/world/Entity.php @@ -635,10 +635,8 @@ class Entity extends Position{ $this->data["Color"] = mt_rand(0,15); } $d[16]["value"] = (($this->data["Sheared"] == 1 ? 1:0) << 4) | ($this->data["Color"] & 0x0F); - }elseif($this->type === OBJECT_PRIMEDTNT){ - if(isset($this->data["fuse"])){ //ladder fix - $d[16]["value"] = (int) max(0, $this->data["fuse"] - (microtime(true) - $this->spawntime) * 20); - } + }elseif($this->class === ENTITY_OBJECT && $this->type === OBJECT_PRIMEDTNT){ //ladder fix 2.0 + $d[16]["value"] = (int) max(0, $this->data["fuse"] - (microtime(true) - $this->spawntime) * 20); }elseif($this->class === ENTITY_PLAYER){ if($this->player->isSleeping !== false){ $d[16]["value"] = 2;