Implemented Falling Sand

src/pocketmine/Server.php

@@ -2061,6 +2061,7 @@ class Server{
 
 			TimingsHandler::tick();
 
+			$now = microtime(true);
 			$updateTime = max(0.01, $tickTime - $this->tickTime);
 
 			array_shift($this->tickAverage);

src/pocketmine/block/Fallable.php

@@ -23,14 +23,51 @@ namespace pocketmine\block;
 
 use pocketmine\item\Item;
 use pocketmine\Player;
+use pocketmine\level\Level;
+use pocketmine\entity\FallingBlock;
+use pocketmine\nbt\tag\Compound;
+use pocketmine\nbt\tag\Enum;
+use pocketmine\nbt\tag\Double;
+use pocketmine\nbt\tag\Float;
+use pocketmine\nbt\tag\Byte;
 
 class Fallable extends Solid{
 
 	public $hasPhysics = true;
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		$ret = $this->getLevel()->setBlock($this, $this, true, false, true);
+		$ret = $this->getLevel()->setBlock($this, $this, true, true);
 
 		return $ret;
 	}
+
+	public function onUpdate($type){
+		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
+			$down = $this->getSide(0);
+			if($down->getID() === self::AIR or ($down instanceof Liquid)){
+				$fall = new FallingBlock($this->getLevel()->getChunkAt($this->x >> 4, $this->z >> 4), new Compound("", [
+					"Pos" => new Enum("Pos", [
+						new Double("", $this->x + 0.5),
+						new Double("", $this->y + 0.5),
+						new Double("", $this->z + 0.5)
+					]),
+					//TODO: add random motion with physics
+					"Motion" => new Enum("Motion", [
+						new Double("", 0),
+						new Double("", 0),
+						new Double("", 0)
+					]),
+					"Rotation" => new Enum("Rotation", [
+						new Float("", 0),
+						new Float("", 0)
+					]),
+					"Tile" => new Byte("Tile", $this->getID())
+				]));
+
+				$fall->spawnToAll();
+			}
+
+			return false;
+		}
+	}
 }

src/pocketmine/block/Generic.php

@@ -28,7 +28,7 @@ use pocketmine\Player;
 class Generic extends Block{
 
 	public function place(Item $item, Block $block, Block $target, $face, $fx, $fy, $fz, Player $player = null){
-		return $this->getLevel()->setBlock($this, $this, true, false, true);
+		return $this->getLevel()->setBlock($this, $this, true, true);
 	}
 
 	public function isBreakable(Item $item){
@@ -36,29 +36,10 @@ class Generic extends Block{
 	}
 
 	public function onBreak(Item $item){
-		return $this->getLevel()->setBlock($this, new Air(), true, false, true);
+		return $this->getLevel()->setBlock($this, new Air(), true, true);
 	}
 
 	public function onUpdate($type){
-		if($this->hasPhysics === true and $type === Level::BLOCK_UPDATE_NORMAL){
-			$down = $this->getSide(0);
-			if($down->getID() === self::AIR or ($down instanceof Liquid)){
-				$data = [
-					"x" => $this->x + 0.5,
-					"y" => $this->y + 0.5,
-					"z" => $this->z + 0.5,
-					"Tile" => $this->id,
-				];
-				/*$this->getLevel()->setBlock($this, new Air(), false, false, true);
-				//TODO
-				//$e = $server->api->entity->add($this->getLevel(), ENTITY_FALLING, FALLING_SAND, $data);
-				//$e->spawnToAll();
-				$server->api->block->blockUpdateAround(clone $this, Level::BLOCK_UPDATE_NORMAL, 1);*/
-			}
-
-			return false;
-		}
-
 		return false;
 	}
 

src/pocketmine/entity/FallingBlock.php

@@ -0,0 +1,143 @@
+<?php
+
+/*
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+namespace pocketmine\entity;
+
+
+use pocketmine\nbt\tag\String;
+use pocketmine\nbt\tag\Byte;
+use pocketmine\block\Block;
+use pocketmine\item\Item;
+use pocketmine\network\protocol\AddEntityPacket;
+use pocketmine\network\protocol\SetEntityMotionPacket;
+use pocketmine\Player;
+use pocketmine\event\entity\EntityDamageEvent;
+
+class FallingBlock extends Entity{
+
+	const NETWORK_ID = 66;
+
+	public $width = 0.98;
+	public $length = 0.98;
+	public $height = 0.98;
+
+	protected $gravity = 0.04;
+	protected $drag = 0.02;
+	protected $blockId = 0;
+
+	protected function initEntity(){
+		$this->namedtag->id = new String("id", "FallingSand");
+		if(isset($this->namedtag->Tile)){
+			$this->blockId = $this->namedtag["Tile"];
+		}
+
+		if($this->blockId === 0){
+			$this->close();
+		}
+	}
+
+	public function canCollideWith(Entity $entity){
+		return false;
+	}
+
+	public function getData(){
+		return [];
+	}
+
+	public function onUpdate(){
+		$this->entityBaseTick();
+
+		if($this->closed !== false){
+			return false;
+		}
+
+		$this->motionY -= $this->gravity;
+
+		$this->move($this->motionX, $this->motionY, $this->motionZ);
+
+		$friction = 1 - $this->drag;
+
+		$this->motionX *= $friction;
+		$this->motionY *= 1 - $this->drag;
+		$this->motionZ *= $friction;
+
+		$pos = $this->floor();
+
+		if($this->ticksLived === 1){
+			$block = $this->level->getBlock($pos);
+			if($block->getID() != $this->blockId){
+				$this->kill();
+				return true;
+			}
+			$this->level->setBlock($pos, Block::get(0, true));
+
+		}
+
+		if($this->onGround){
+			$this->kill();
+			$block = $this->level->getBlock($pos);
+			if(!$block->isFullBlock){
+				$this->getLevel()->dropItem($this, Item::get($this->getBlock(), 0, 1));
+			}else{
+				$this->getLevel()->setBlock($pos, Block::get($this->getBlock(), 0), true);
+			}
+		}
+
+		$this->updateMovement();
+
+		return !$this->onGround or ($this->motionX == 0 and $this->motionY == 0 and $this->motionZ == 0);
+	}
+
+	public function getBlock(){
+		return $this->blockId;
+	}
+
+	public function saveNBT(){
+		$this->namedtag->Tile = new Byte("Tile", $this->blockId);
+	}
+
+	public function attack($damage, $source = EntityDamageEvent::CAUSE_MAGIC){
+
+	}
+
+	public function heal($amount){
+
+	}
+
+	public function spawnTo(Player $player){
+		$pk = new AddEntityPacket;
+		$pk->type = FallingBlock::NETWORK_ID;
+		$pk->eid = $this->getID();
+		$pk->x = $this->x;
+		$pk->y = $this->y;
+		$pk->z = $this->z;
+		$pk->did = -$this->getBlock();
+		$player->dataPacket($pk);
+
+		$pk = new SetEntityMotionPacket;
+		$pk->entities = [
+			[$this->getID(), $this->motionX, $this->motionY, $this->motionZ]
+		];
+		$player->dataPacket($pk);
+
+		parent::spawnTo($player);
+	}
+}

src/pocketmine/entity/FallingSand.php

@@ -1,31 +0,0 @@
-<?php
-
-/*
- *
- *  ____            _        _   __  __ _                  __  __ ____  
- * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
- * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
- * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
- * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * @author PocketMine Team
- * @link http://www.pocketmine.net/
- * 
- *
-*/
-
-namespace pocketmine\entity;
-
-
-use pocketmine\nbt\tag\String;
-
-class FallingSand extends Entity{
-	protected function initEntity(){
-		$this->namedtag->id = new String("id", "FallingSand");
-	}
-}