mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-10-18 12:04:46 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.5'

Browse Source
This commit is contained in:
Dylan K. Taylor
2019-01-04 00:37:48 +00:00
parent 8ef15d728a d71a543d10
commit e1064a9e36
9 changed files with 49 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pocketmine/inventory/Inventory.php
View File

@@ -27,6 +27,8 @@ declare(strict_types=1);
namespace pocketmine\inventory;
use pocketmine\item\Item;
use pocketmine\level\Level;
use pocketmine\math\Vector3;
use pocketmine\Player;
interface Inventory{
@@ -120,6 +122,15 @@ interface Inventory{
*/
public function setContents(array $items, bool $send = true) : void;
/**
* Drops the contents of the inventory into the specified Level at the specified position and clears the inventory
* contents.
*
* @param Level $level
* @param Vector3 $position
*/
public function dropContents(Level $level, Vector3 $position) : void;
/**
* @param Player|Player[] $target
*/

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

@@ -173,16 +173,21 @@ class PlayerInventory extends BaseInventory{
}
public function sendCreativeContents(){
//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");
}
$pk = new InventoryContentPacket();
$pk->windowId = ContainerIds::CREATIVE;
if(!$this->getHolder()->isSpectator()){ //fill it for all gamemodes except spectator
if(!$holder->isSpectator()){ //fill it for all gamemodes except spectator
foreach(Item::getCreativeItems() as $i => $item){
$pk->items[$i] = clone $item;
}
}
$this->getHolder()->sendDataPacket($pk);
$holder->sendDataPacket($pk);
}
/**