diff --git a/src/pocketmine/CrashDump.php b/src/pocketmine/CrashDump.php index 537234bb9..91606951f 100644 --- a/src/pocketmine/CrashDump.php +++ b/src/pocketmine/CrashDump.php @@ -228,7 +228,7 @@ class CrashDump{ $this->data["general"]["zend"] = zend_version(); $this->data["general"]["php_os"] = PHP_OS; $this->data["general"]["os"] = Utils::getOS(); - $this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getNumber() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]"); + $this->addLine("PocketMine-MP version: " . $version->get(false) . " #" . $version->getBuild() . " [Protocol " . Info::CURRENT_PROTOCOL . "; API " . API_VERSION . "]"); $this->addLine("Git commit: " . GIT_COMMIT); $this->addLine("uname -a: " . php_uname("a")); $this->addLine("PHP Version: " . phpversion()); diff --git a/src/pocketmine/Player.php b/src/pocketmine/Player.php index bb50eb53e..e4accebc4 100644 --- a/src/pocketmine/Player.php +++ b/src/pocketmine/Player.php @@ -1344,20 +1344,6 @@ class Player extends Human implements CommandSender, InventoryHolder, IPlayer{ $this->server->getLogger()->warning($this->getName()." moved too quickly!"); $revert = true; }else{ - - /*if(($this->onGround and $dy != 0) or (!$this->onGround and $dy <= 0)){ - if(count($this->getLevel()->getCollisionBlocks($this->boundingBox->getOffsetBoundingBox(0, $dy - 0.1, 0))) > 0){ - $isColliding = true; - }else{ - $isColliding = false; - } - - $this->onGround = ($dy <= 0 and $isColliding); - } - - $this->updateFallState($dy, $this->onGround);*/ - - if($this->chunk === null or !$this->chunk->isGenerated()){ $chunk = $this->getLevel()->getChunkAt($newPos->x >> 4, $newPos->z >> 4); if(!($chunk instanceof FullChunk) or !$chunk->isGenerated()){ diff --git a/src/pocketmine/entity/Entity.php b/src/pocketmine/entity/Entity.php index 34b2972fd..7131e8d02 100644 --- a/src/pocketmine/entity/Entity.php +++ b/src/pocketmine/entity/Entity.php @@ -1114,7 +1114,6 @@ abstract class Entity extends Position implements Metadatable{ $level->removeEntity($this); } $this->despawnFromAll(); - $this->level = null; } } diff --git a/src/pocketmine/tile/Tile.php b/src/pocketmine/tile/Tile.php index 1a7402ac9..41871de02 100644 --- a/src/pocketmine/tile/Tile.php +++ b/src/pocketmine/tile/Tile.php @@ -118,7 +118,6 @@ abstract class Tile extends Position{ if(($level = $this->getLevel()) instanceof Level){ $level->removeTile($this); } - $this->level = null; } }