mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-04-22 16:51:42 +00:00
Code Issues Projects Releases Wiki Activity

Do not store a pre-compressed cache for crafting data

Browse Source 
this reduces bandwidth efficiency because it can't be compressed with everything else this way. If we want to cache stuff sent during the login sequence, it's better to stuff a bunch of stuff into a batch (e.g. crafting, creative, actor ids, biome defs) and pre-compress that as one big package instead.
This commit is contained in:
Dylan K. Taylor 2020-11-11 18:20:03 +00:00
parent 8f36957c10
commit c4d35d52e8
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/crafting/CraftingManager.php
View File

@ -24,11 +24,8 @@ declare(strict_types=1);
namespace pocketmine\crafting;
use pocketmine\item\Item;
use pocketmine\network\mcpe\compression\CompressBatchPromise;
use pocketmine\network\mcpe\compression\Compressor;
use pocketmine\network\mcpe\convert\TypeConverter;
use pocketmine\network\mcpe\protocol\CraftingDataPacket;
use pocketmine\network\mcpe\protocol\serializer\PacketBatch;
use pocketmine\network\mcpe\protocol\types\inventory\ItemStack;
use pocketmine\network\mcpe\protocol\types\recipe\FurnaceRecipe as ProtocolFurnaceRecipe;
use pocketmine\network\mcpe\protocol\types\recipe\RecipeIngredient;
@ -39,7 +36,6 @@ use pocketmine\utils\Binary;
use pocketmine\uuid\UUID;
use function array_map;
use function json_encode;
use function spl_object_id;
use function str_repeat;
use function usort;
@ -52,20 +48,20 @@ class CraftingManager{
/** @var FurnaceRecipeManager */
protected $furnaceRecipeManager;
/** @var CompressBatchPromise[] */
private $craftingDataCaches = [];
/** @var CraftingDataPacket|null */
private $craftingDataCache = null;
public function __construct(){
$this->furnaceRecipeManager = new FurnaceRecipeManager();
$this->furnaceRecipeManager->getRecipeRegisteredCallbacks()->add(function(FurnaceRecipe $recipe) : void{
$this->craftingDataCaches = [];
$this->craftingDataCache = null;
});
}
/**
* Rebuilds the cached CraftingDataPacket.
*/
private function buildCraftingDataCache(Compressor $compressor) : CompressBatchPromise{
private function buildCraftingDataCache() : CraftingDataPacket{
Timings::$craftingDataCacheRebuildTimer->startTiming();
$pk = new CraftingDataPacket();
$pk->cleanRecipes = true;
@ -126,24 +122,18 @@ class CraftingManager{
);
}
$promise = new CompressBatchPromise();
$promise->resolve($compressor->compress(PacketBatch::fromPackets($pk)->getBuffer()));
Timings::$craftingDataCacheRebuildTimer->stopTiming();
return $promise;
return $pk;
}
/**
* Returns a pre-compressed CraftingDataPacket for sending to players. Rebuilds the cache if it is not found.
*/
public function getCraftingDataPacket(Compressor $compressor) : CompressBatchPromise{
$compressorId = spl_object_id($compressor);
if(!isset($this->craftingDataCaches[$compressorId])){
$this->craftingDataCaches[$compressorId] = $this->buildCraftingDataCache($compressor);
public function getCraftingDataPacket() : CraftingDataPacket{
if($this->craftingDataCache === null){
$this->craftingDataCache = $this->buildCraftingDataCache();
}
return $this->craftingDataCaches[$compressorId];
return $this->craftingDataCache;
}
/**
@ -215,13 +205,13 @@ class CraftingManager{
public function registerShapedRecipe(ShapedRecipe $recipe) : void{
$this->shapedRecipes[self::hashOutputs($recipe->getResults())][] = $recipe;
$this->craftingDataCaches = [];
$this->craftingDataCache = null;
}
public function registerShapelessRecipe(ShapelessRecipe $recipe) : void{
$this->shapelessRecipes[self::hashOutputs($recipe->getResults())][] = $recipe;
$this->craftingDataCaches = [];
$this->craftingDataCache = null;
}
/**

2
src/network/mcpe/handler/PreSpawnPacketHandler.php
View File

@ -100,7 +100,7 @@ class PreSpawnPacketHandler extends PacketHandler{
$this->session->getInvManager()->syncAll();
$this->session->getInvManager()->syncCreative();
$this->session->getInvManager()->syncSelectedHotbarSlot();
$this->session->queueCompressed($this->server->getCraftingManager()->getCraftingDataPacket($this->session->getCompressor()));
$this->session->sendDataPacket($this->server->getCraftingManager()->getCraftingDataPacket());
$this->session->syncPlayerList($this->server->getOnlinePlayers());
}