mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-26 21:29:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'release/3.4'

Browse Source
This commit is contained in:
Dylan K. Taylor 2018-11-29 19:57:35 +00:00
commit ed531c0009
3 changed files with 55 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pocketmine/Player.php
View File

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

9
src/pocketmine/Server.php
View File

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

7
src/pocketmine/item/PaintingItem.php
View File

@ -38,8 +38,10 @@ class PaintingItem extends Item{
} }
public function onActivate(Player $player, Block $blockReplace, Block $blockClicked, int $face, Vector3 $clickVector) : bool{ 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 = []; $motives = [];
$totalDimension = 0; $totalDimension = 0;
@ -99,7 +101,6 @@ class PaintingItem extends Item{
$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; return false;
} }