Merge branch 'release/3.4'

src/pocketmine/Player.php

@@ -2920,11 +2920,9 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 	/**
 	 * Handles player data saving
 	 *
-	 * @param bool $async
-	 *
 	 * @throws \InvalidStateException if the player is closed
 	 */
-	public function save(bool $async = false){
+	public function save(){
 		if($this->closed){
 			throw new \InvalidStateException("Tried to save closed player");
 		}
@@ -2961,7 +2959,7 @@ class Player extends Human implements CommandSender, ChunkLoader, IPlayer{
 		$nbt->setLong("firstPlayed", $this->firstPlayed);
 		$nbt->setLong("lastPlayed", (int) floor(microtime(true) * 1000));
 
-		$this->server->saveOfflinePlayerData($this->username, $nbt, $async);
+		$this->server->saveOfflinePlayerData($this->username, $nbt);
 	}
 
 	public function kill() : void{

src/pocketmine/Server.php

@@ -802,9 +802,8 @@ class Server{
 	/**
 	 * @param string      $name
 	 * @param CompoundTag $nbtTag
-	 * @param bool        $async
 	 */
-	public function saveOfflinePlayerData(string $name, CompoundTag $nbtTag, bool $async = false){
+	public function saveOfflinePlayerData(string $name, CompoundTag $nbtTag){
 		$ev = new PlayerDataSaveEvent($nbtTag, $name);
 		$ev->setCancelled(!$this->shouldSavePlayerData());
 
@@ -813,11 +812,7 @@ class Server{
 		if(!$ev->isCancelled()){
 			$nbt = new BigEndianNBTStream();
 			try{
-				if($async){
+				file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData()));
-					$this->asyncPool->submitTask(new FileWriteTask($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData())));
-				}else{
-					file_put_contents($this->getDataPath() . "players/" . strtolower($name) . ".dat", $nbt->writeCompressed($ev->getSaveData()));
-				}
 			}catch(\Throwable $e){
 				$this->logger->critical($this->getLanguage()->translateString("pocketmine.data.saveError", [$name, $e->getMessage()]));
 				$this->logger->logException($e);
@@ -2445,7 +2440,7 @@ class Server{
 			Timings::$worldSaveTimer->startTiming();
 			foreach($this->players as $index => $player){
 				if($player->spawned){
-					$player->save(true);
+					$player->save();
 				}elseif(!$player->isConnected()){
 					$this->removePlayer($player);
 				}

src/pocketmine/item/PaintingItem.php

@@ -38,67 +38,68 @@ class PaintingItem extends Item{
 	}
 
 	public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{
-		if(!$blockClicked->isTransparent() and $face > 1 and !$blockReplace->isSolid()){
+		if(Facing::axis($face) === Facing::AXIS_Y){
-			/** @var PaintingMotive[] $motives */
+			return false;
-			$motives = [];
+		}
 
-			$totalDimension = 0;
+		$motives = [];
-			foreach(PaintingMotive::getAll() as $motive){
+
-				$currentTotalDimension = $motive->getHeight() + $motive->getWidth();
+		$totalDimension = 0;
-				if($currentTotalDimension < $totalDimension){
+		foreach(PaintingMotive::getAll() as $motive){
-					continue;
+			$currentTotalDimension = $motive->getHeight() + $motive->getWidth();
+			if($currentTotalDimension < $totalDimension){
+				continue;
+			}
+
+			if(Painting::canFit($player->level, $blockReplace, $face, true, $motive)){
+				if($currentTotalDimension > $totalDimension){
+					$totalDimension = $currentTotalDimension;
+					/*
+					 * This drops all motive possibilities smaller than this
+					 * We use the total of height + width to allow equal chance of horizontal/vertical paintings
+					 * when there is an L-shape of space available.
+					 */
+					$motives = [];
 				}
 
-				if(Painting::canFit($player->level, $blockReplace, $face, true, $motive)){
+				$motives[] = $motive;
-					if($currentTotalDimension > $totalDimension){
-						$totalDimension = $currentTotalDimension;
-						/*
-						 * This drops all motive possibilities smaller than this
-						 * We use the total of height + width to allow equal chance of horizontal/vertical paintings
-						 * when there is an L-shape of space available.
-						 */
-						$motives = [];
-					}
-
-					$motives[] = $motive;
-				}
 			}
+		}
 
-			if(empty($motives)){ //No space available
+		if(empty($motives)){ //No space available
-				return false;
+			return false;
-			}
+		}
 
-			/** @var PaintingMotive $motive */
+		/** @var PaintingMotive $motive */
-			$motive = $motives[array_rand($motives)];
+		$motive = $motives[array_rand($motives)];
 
-			static $directions = [
+		static $directions = [
-				Facing::SOUTH => 0,
+			Facing::SOUTH => 0,
-				Facing::WEST => 1,
+			Facing::WEST => 1,
-				Facing::NORTH => 2,
+			Facing::NORTH => 2,
-				Facing::EAST => 3
+			Facing::EAST => 3
-			];
+		];
 
-			$direction = $directions[$face] ?? -1;
+		$direction = $directions[$face] ?? -1;
-			if($direction === -1){
+		if($direction === -1){
-				return false;
+			return false;
-			}
+		}
 
-			$nbt = Entity::createBaseNBT($blockReplace, null, $direction * 90, 0);
+		$nbt = Entity::createBaseNBT($blockReplace, null, $direction * 90, 0);
-			$nbt->setByte("Direction", $direction);
+		$nbt->setByte("Direction", $direction);
-			$nbt->setString("Motive", $motive->getName());
+		$nbt->setString("Motive", $motive->getName());
-			$nbt->setInt("TileX", $blockClicked->getFloorX());
+		$nbt->setInt("TileX", $blockClicked->getFloorX());
-			$nbt->setInt("TileY", $blockClicked->getFloorY());
+		$nbt->setInt("TileY", $blockClicked->getFloorY());
-			$nbt->setInt("TileZ", $blockClicked->getFloorZ());
+		$nbt->setInt("TileZ", $blockClicked->getFloorZ());
 
-			$entity = Entity::createEntity("Painting", $blockReplace->getLevel(), $nbt);
+		$entity = Entity::createEntity("Painting", $blockReplace->getLevel(), $nbt);
 
-			if($entity instanceof Entity){
+		if($entity instanceof Entity){
-				$this->pop();
+			$this->pop();
-				$entity->spawnToAll();
+			$entity->spawnToAll();
 
-				$player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound
+			$player->getLevel()->broadcastLevelEvent($blockReplace->add(0.5, 0.5, 0.5), LevelEventPacket::EVENT_SOUND_ITEMFRAME_PLACE); //item frame and painting have the same sound
-				return true;
+			return true;
-			}
 		}
 
 		return false;