Release 3.1.4

closes #2382 (squash-merge)

src/pocketmine/OfflinePlayer.php

@@ -44,7 +44,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	public function __construct(Server $server, string $name){
 		$this->server = $server;
 		$this->name = $name;
-		if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->getName()) . ".dat")){
+		if(file_exists($this->server->getDataPath() . "players/" . strtolower($this->name) . ".dat")){
 			$this->namedtag = $this->server->getOfflinePlayerData($this->name);
 		}else{
 			$this->namedtag = null;
@@ -64,7 +64,7 @@ class OfflinePlayer implements IPlayer, Metadatable{
 	}
 
 	public function isOp() : bool{
-		return $this->server->isOp(strtolower($this->getName()));
+		return $this->server->isOp($this->name);
 	}
 
 	public function setOp(bool $value){
@@ -73,38 +73,38 @@ class OfflinePlayer implements IPlayer, Metadatable{
 		}
 
 		if($value){
-			$this->server->addOp(strtolower($this->getName()));
+			$this->server->addOp($this->name);
 		}else{
-			$this->server->removeOp(strtolower($this->getName()));
+			$this->server->removeOp($this->name);
 		}
 	}
 
 	public function isBanned() : bool{
-		return $this->server->getNameBans()->isBanned(strtolower($this->getName()));
+		return $this->server->getNameBans()->isBanned($this->name);
 	}
 
 	public function setBanned(bool $value){
 		if($value){
-			$this->server->getNameBans()->addBan($this->getName(), null, null, null);
+			$this->server->getNameBans()->addBan($this->name, null, null, null);
 		}else{
-			$this->server->getNameBans()->remove($this->getName());
+			$this->server->getNameBans()->remove($this->name);
 		}
 	}
 
 	public function isWhitelisted() : bool{
-		return $this->server->isWhitelisted(strtolower($this->getName()));
+		return $this->server->isWhitelisted($this->name);
 	}
 
 	public function setWhitelisted(bool $value){
 		if($value){
-			$this->server->addWhitelist(strtolower($this->getName()));
+			$this->server->addWhitelist($this->name);
 		}else{
-			$this->server->removeWhitelist(strtolower($this->getName()));
+			$this->server->removeWhitelist($this->name);
 		}
 	}
 
 	public function getPlayer(){
-		return $this->server->getPlayerExact($this->getName());
+		return $this->server->getPlayerExact($this->name);
 	}
 
 	public function getFirstPlayed(){

src/pocketmine/PocketMine.php

@@ -37,7 +37,7 @@ namespace pocketmine {
 	use pocketmine\wizard\SetupWizard;
 
 	const NAME = "PocketMine-MP";
-	const BASE_VERSION = "3.1.3";
+	const BASE_VERSION = "3.1.4";
 	const IS_DEVELOPMENT_BUILD = false;
 	const BUILD_NUMBER = 0;
 

src/pocketmine/Server.php

@@ -2013,6 +2013,10 @@ class Server{
 			return;
 		}
 
+		if($this->doTitleTick){
+			echo "\x1b]0;\x07";
+		}
+
 		try{
 			if(!$this->isRunning()){
 				$this->sendUsage(SendUsageTask::TYPE_CLOSE);

src/pocketmine/block/CoalOre.php

@@ -57,7 +57,7 @@ class CoalOre extends Solid{
 		];
 	}
 
-	public function getXpDropForTool(Item $item) : int{
+	protected function getXpDropAmount() : int{
 		return mt_rand(0, 2);
 	}
 }

src/pocketmine/entity/object/FallingBlock.php

@@ -134,6 +134,7 @@ class FallingBlock extends Entity{
 	}
 
 	public function saveNBT() : void{
+		parent::saveNBT();
 		$this->namedtag->setInt("TileID", $this->block->getId(), true);
 		$this->namedtag->setByte("Data", $this->block->getDamage());
 	}

src/pocketmine/entity/object/ItemEntity.php

@@ -197,7 +197,7 @@ class ItemEntity extends Entity{
 	}
 
 	public function onCollideWithPlayer(Player $player) : void{
-		if($this->getPickupDelay() > 0){
+		if($this->getPickupDelay() !== 0){
 			return;
 		}
 

src/pocketmine/entity/projectile/SplashPotion.php

@@ -82,7 +82,7 @@ class SplashPotion extends Throwable{
 		if($hasEffects){
 			if(!$this->willLinger()){
 				foreach($this->level->getNearbyEntities($this->boundingBox->expandedCopy(4.125, 2.125, 4.125), $this) as $entity){
-					if($entity instanceof Living){
+					if($entity instanceof Living and $entity->isAlive()){
 						$distanceSquared = $entity->distanceSquared($this);
 						if($distanceSquared > 16){ //4 blocks
 							continue;

src/pocketmine/inventory/transaction/action/DropItemAction.php

@@ -38,7 +38,7 @@ class DropItemAction extends InventoryAction{
 	}
 
 	public function isValid(Player $source) : bool{
-		return true;
+		return !$this->targetItem->isNull();
 	}
 
 	public function onPreExecute(Player $source) : bool{

src/pocketmine/level/Level.php

@@ -797,8 +797,10 @@ class Level implements ChunkManager, Metadatable{
 			$this->checkSleep();
 		}
 
-		if(!empty($this->players) and !empty($this->globalPackets)){
-			$this->server->batchPackets($this->players, $this->globalPackets);
+		if(!empty($this->globalPackets)){
+			if(!empty($this->players)){
+				$this->server->batchPackets($this->players, $this->globalPackets);
+			}
 			$this->globalPackets = [];
 		}
 

src/pocketmine/network/mcpe/protocol/GuiDataPickItemPacket.php

@@ -30,14 +30,22 @@ use pocketmine\network\mcpe\NetworkSession;
 class GuiDataPickItemPacket extends DataPacket{
 	public const NETWORK_ID = ProtocolInfo::GUI_DATA_PICK_ITEM_PACKET;
 
+	/** @var string */
+	public $itemDescription;
+	/** @var string */
+	public $itemEffects;
 	/** @var int */
 	public $hotbarSlot;
 
 	protected function decodePayload(){
+		$this->itemDescription = $this->getString();
+		$this->itemEffects = $this->getString();
 		$this->hotbarSlot = $this->getLInt();
 	}
 
 	protected function encodePayload(){
+		$this->putString($this->itemDescription);
+		$this->putString($this->itemEffects);
 		$this->putLInt($this->hotbarSlot);
 	}
 

src/pocketmine/network/mcpe/protocol/PlayerSkinPacket.php

@@ -40,7 +40,8 @@ class PlayerSkinPacket extends DataPacket{
 	public $newSkinName = "";
 	/** @var Skin */
 	public $skin;
-
+	/** @var bool */
+	public $premiumSkin = false;
 
 	protected function decodePayload(){
 		$this->uuid = $this->getUUID();
@@ -54,6 +55,8 @@ class PlayerSkinPacket extends DataPacket{
 		$geometryData = $this->getString();
 
 		$this->skin = new Skin($skinId, $skinData, $capeData, $geometryModel, $geometryData);
+
+		$this->premiumSkin = $this->getBool();
 	}
 
 	protected function encodePayload(){
@@ -66,6 +69,8 @@ class PlayerSkinPacket extends DataPacket{
 		$this->putString($this->skin->getCapeData());
 		$this->putString($this->skin->getGeometryName());
 		$this->putString($this->skin->getGeometryData());
+
+		$this->putBool($this->premiumSkin);
 	}
 
 	public function handle(NetworkSession $session) : bool{