mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-05-13 17:29:44 +00:00
Code Issues Projects Releases Wiki Activity

World: relocate packet stuff for time and difficulty behind NetworkSession API

Browse Source
This commit is contained in:
Dylan K. Taylor 2020-04-29 18:31:54 +01:00
parent c8c0a1533c
commit bb11cbd89c
2 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/network/mcpe/NetworkSession.php
View File

@ -72,8 +72,10 @@ use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
use pocketmine\network\mcpe\protocol\ServerboundPacket; use pocketmine\network\mcpe\protocol\ServerboundPacket;
use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket; use pocketmine\network\mcpe\protocol\ServerToClientHandshakePacket;
use pocketmine\network\mcpe\protocol\SetActorDataPacket; use pocketmine\network\mcpe\protocol\SetActorDataPacket;
use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket; use pocketmine\network\mcpe\protocol\SetPlayerGameTypePacket;
use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket; use pocketmine\network\mcpe\protocol\SetSpawnPositionPacket;
use pocketmine\network\mcpe\protocol\SetTimePacket;
use pocketmine\network\mcpe\protocol\SetTitlePacket; use pocketmine\network\mcpe\protocol\SetTitlePacket;
use pocketmine\network\mcpe\protocol\TakeItemActorPacket; use pocketmine\network\mcpe\protocol\TakeItemActorPacket;
use pocketmine\network\mcpe\protocol\TextPacket; use pocketmine\network\mcpe\protocol\TextPacket;
@ -815,8 +817,16 @@ class NetworkSession{
public function onEnterWorld() : void{ public function onEnterWorld() : void{
$world = $this->player->getWorld(); $world = $this->player->getWorld();
$world->sendTime($this->player); $this->syncWorldTime($world->getTime());
$world->sendDifficulty($this->player); $this->syncWorldDifficulty($world->getDifficulty());
}
public function syncWorldTime(int $worldTime) : void{
$this->sendDataPacket(SetTimePacket::create($worldTime));
}
public function syncWorldDifficulty(int $worldDifficulty) : void{
$this->sendDataPacket(SetDifficultyPacket::create($worldDifficulty));
} }
public function getInvManager() : InventoryManager{ public function getInvManager() : InventoryManager{

24
src/world/World.php
View File

@ -54,8 +54,6 @@ use pocketmine\math\Vector3;
use pocketmine\network\mcpe\protocol\BlockActorDataPacket; use pocketmine\network\mcpe\protocol\BlockActorDataPacket;
use pocketmine\network\mcpe\protocol\ClientboundPacket; use pocketmine\network\mcpe\protocol\ClientboundPacket;
use pocketmine\network\mcpe\protocol\LevelEventPacket; use pocketmine\network\mcpe\protocol\LevelEventPacket;
use pocketmine\network\mcpe\protocol\SetDifficultyPacket;
use pocketmine\network\mcpe\protocol\SetTimePacket;
use pocketmine\network\mcpe\protocol\UpdateBlockPacket; use pocketmine\network\mcpe\protocol\UpdateBlockPacket;
use pocketmine\player\Player; use pocketmine\player\Player;
use pocketmine\Server; use pocketmine\Server;
@ -644,12 +642,8 @@ class World implements ChunkManager{
* @param Player ...$targets If empty, will send to all players in the world. * @param Player ...$targets If empty, will send to all players in the world.
*/ */
public function sendTime(Player ...$targets) : void{ public function sendTime(Player ...$targets) : void{
$pk = SetTimePacket::create($this->time); foreach($targets as $player){
$player->getNetworkSession()->syncWorldTime($this->time);
if(count($targets) === 0){
$this->broadcastGlobalPacket($pk);
}else{
$this->server->broadcastPackets($targets, [$pk]);
} }
} }
@ -2362,18 +2356,8 @@ class World implements ChunkManager{
} }
$this->provider->getWorldData()->setDifficulty($difficulty); $this->provider->getWorldData()->setDifficulty($difficulty);
$this->sendDifficulty(); foreach($this->players as $player){
} $player->getNetworkSession()->syncWorldDifficulty($this->getDifficulty());
/**
* @param Player ...$targets
*/
public function sendDifficulty(Player ...$targets) : void{
$pk = SetDifficultyPacket::create($this->getDifficulty());
if(count($targets) === 0){
$this->broadcastGlobalPacket($pk);
}else{
$this->server->broadcastPackets($targets, [$pk]);
} }
} }