mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-06-27 05:40:01 +00:00
Code Issues Projects Releases Wiki Activity

Moved creative inventory sync to NetworkSession

Browse Source
This commit is contained in:
Dylan K. Taylor 2019-06-10 19:54:24 +01:00
parent dd45753fa9
commit f0d56f25b6
4 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/Player.php
View File

@ -1302,7 +1302,7 @@ class Player extends Human implements CommandSender, ChunkLoader, ChunkListener,
}
$this->networkSession->syncAdventureSettings($this);
$this->inventory->sendCreativeContents();
$this->networkSession->syncCreativeInventoryContents();
return true;
}

18
src/pocketmine/inventory/PlayerInventory.php
View File

@ -25,7 +25,6 @@ namespace pocketmine\inventory;
use pocketmine\entity\Human;
use pocketmine\item\Item;
use pocketmine\network\mcpe\protocol\InventoryContentPacket;
use pocketmine\network\mcpe\protocol\MobEquipmentPacket;
use pocketmine\network\mcpe\protocol\types\ContainerIds;
use pocketmine\Player;
@ -156,23 +155,6 @@ class PlayerInventory extends BaseInventory{
return 9;
}
public function sendCreativeContents() : void{
//TODO: this mess shouldn't be in here
$holder = $this->getHolder();
if(!($holder instanceof Player)){
throw new \LogicException("Cannot send creative inventory contents to non-player inventory holder");
}
$items = [];
if(!$holder->isSpectator()){ //fill it for all gamemodes except spectator
foreach(CreativeInventory::getAll() as $i => $item){
$items[$i] = clone $item;
}
}
$holder->sendDataPacket(InventoryContentPacket::create(ContainerIds::CREATIVE, $items));
}
/**
* This override is here for documentation and code completion purposes only.
* @return Human|Player

12
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -30,6 +30,7 @@ use pocketmine\event\server\DataPacketReceiveEvent;
use pocketmine\event\server\DataPacketSendEvent;
use pocketmine\form\Form;
use pocketmine\GameMode;
use pocketmine\inventory\CreativeInventory;
use pocketmine\inventory\Inventory;
use pocketmine\math\Vector3;
use pocketmine\network\BadPacketException;
@ -774,6 +775,17 @@ class NetworkSession{
}
}
public function syncCreativeInventoryContents() : void{
$items = [];
if(!$this->player->isSpectator()){ //fill it for all gamemodes except spectator
foreach(CreativeInventory::getAll() as $i => $item){
$items[$i] = clone $item;
}
}
$this->sendDataPacket(InventoryContentPacket::create(ContainerIds::CREATIVE, $items));
}
public function onMobArmorChange(Living $mob) : void{
$inv = $mob->getArmorInventory();
$this->sendDataPacket(MobArmorEquipmentPacket::create($mob->getId(), $inv->getHelmet(), $inv->getChestplate(), $inv->getLeggings(), $inv->getBoots()));

2
src/pocketmine/network/mcpe/handler/PreSpawnSessionHandler.php
View File

@ -92,7 +92,7 @@ class PreSpawnSessionHandler extends SessionHandler{
$this->player->sendData($this->player);
$this->session->syncAllInventoryContents();
$this->player->getInventory()->sendCreativeContents();
$this->session->syncCreativeInventoryContents();
$this->player->getInventory()->sendHeldItem($this->player);
$this->session->queueCompressed($this->server->getCraftingManager()->getCraftingDataPacket());